diff --git a/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.cpp b/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.cpp
index fb9b2baa..749819c0 100644
--- a/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.cpp
+++ b/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.cpp
@@ -242,7 +242,8 @@ RTCManagerPanel::RTCManagerPanel(QWidget * parent) : rviz_common::Panel(parent)
     rtc_table_ = new QTableWidget();
     rtc_table_->setColumnCount(column_size_);
     rtc_table_->setHorizontalHeaderLabels(
-      {"ID", "Module", "AW Safe", "Received Cmd", "AutoMode", "State", "StartDistance", "FinishDistance"});
+      {"ID", "Module", "AW\nSafe", "Recv\nCmd", "Auto\nMode", "State", "Start\nDistance",
+       "Finish\nDistance"});
     rtc_table_->setVerticalHeader(vertical_header);
     rtc_table_->setHorizontalHeader(horizontal_header);
     rtc_table_layout->addWidget(rtc_table_);
@@ -441,30 +442,29 @@ void RTCManagerPanel::onRTCStatus(const CooperateStatusArray::ConstSharedPtr msg
     // State
     std::string module_state = "NONE";
     {
-      switch (status.state.type)
-      {
-      case State::WAITING_FOR_EXECUTION:
-        module_state = "Waiting";
-        break;
-      case State::RUNNING:
-        module_state = "Running";
-        break;
-      case State::ABORTING:
-        module_state = "Aborting";
-        break;
-      case State::SUCCEEDED:
-        module_state = "Succeeded";
-        break;
-      case State::FAILED:
-        module_state = "Failed";
-        break;
-      default:
-        break;
+      switch (status.state.type) {
+        case State::WAITING_FOR_EXECUTION:
+          module_state = "Waiting";
+          break;
+        case State::RUNNING:
+          module_state = "Running";
+          break;
+        case State::ABORTING:
+          module_state = "Aborting";
+          break;
+        case State::SUCCEEDED:
+          module_state = "Succeeded";
+          break;
+        case State::FAILED:
+          module_state = "Failed";
+          break;
+        default:
+          break;
       }
       auto label = new QLabel(QString::fromStdString(module_state));
       label->setAlignment(Qt::AlignCenter);
       label->setText(QString::fromStdString(module_state));
-      rtc_table_->setCellWidget(cnt, 5 , label);
+      rtc_table_->setCellWidget(cnt, 5, label);
     }
 
     // start distance
diff --git a/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.hpp b/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.hpp
index 9cf11fcd..80eb77eb 100644
--- a/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.hpp
+++ b/common/rtc_manager_rviz_plugin/src/rtc_manager_panel.hpp
@@ -41,9 +41,9 @@
 #include <tier4_rtc_msgs/msg/cooperate_status.hpp>
 #include <tier4_rtc_msgs/msg/cooperate_status_array.hpp>
 #include <tier4_rtc_msgs/msg/module.hpp>
+#include <tier4_rtc_msgs/msg/state.hpp>
 #include <tier4_rtc_msgs/srv/auto_mode.hpp>
 #include <tier4_rtc_msgs/srv/cooperate_commands.hpp>
-#include <tier4_rtc_msgs/msg/state.hpp>
 #endif
 
 namespace rviz_plugins
@@ -54,9 +54,9 @@ using tier4_rtc_msgs::msg::CooperateResponse;
 using tier4_rtc_msgs::msg::CooperateStatus;
 using tier4_rtc_msgs::msg::CooperateStatusArray;
 using tier4_rtc_msgs::msg::Module;
+using tier4_rtc_msgs::msg::State;
 using tier4_rtc_msgs::srv::AutoMode;
 using tier4_rtc_msgs::srv::CooperateCommands;
-using tier4_rtc_msgs::msg::State;
 using unique_identifier_msgs::msg::UUID;
 
 static const QString BG_BLUE = "background-color: #3dffff;";