diff --git a/source/Navigation/components/Navigator/Navigator.cpp b/source/Navigation/components/Navigator/Navigator.cpp
index a98856e9ab7bd64997057242bd405ecdb27ae57a..3336b87d7106ad1bb230fce89009d5b449a895af 100644
--- a/source/Navigation/components/Navigator/Navigator.cpp
+++ b/source/Navigation/components/Navigator/Navigator.cpp
@@ -33,6 +33,7 @@
 
 #include "ArmarXCore/core/services/tasks/TaskUtil.h"
 #include "ArmarXCore/util/CPPUtility/trace.h"
+#include "ArmarXGui/libraries/RemoteGui/Client/Widgets.h"
 
 #include "RobotAPI/libraries/core/remoterobot/RemoteRobot.h"
 
@@ -261,6 +262,11 @@ void armarx::nav::components::Navigator::createRemoteGuiTab()
         GridLayout grid;
         int row = 0;
         {
+
+            tab.controlGroup.continueButton.setLabel("Continue");
+            tab.controlGroup.pauseButton.setLabel("Pause");
+            tab.controlGroup.moveToButton.setLabel("MoveTo");
+
             grid.add(Label("X"), {row, 0}).add(tab.targetPoseGroup.targetPoseX, {row, 1});
             ++row;
 
@@ -295,7 +301,7 @@ void armarx::nav::components::Navigator::createRemoteGuiTab()
         tab.controlGroup.group.setLabel("Control");
 
         GridLayout grid;
-        int row = 0;
+        int row = 10;
         {
             grid.add(tab.controlGroup.moveToButton, {row, 1});
             ++row;
@@ -313,7 +319,10 @@ void armarx::nav::components::Navigator::createRemoteGuiTab()
 
     ARMARX_TRACE;
 
-    RemoteGui_createTab(getName(), tab.targetPoseGroup.group, &tab);
+    tab.hbox.addChild(tab.targetPoseGroup.group);
+    tab.hbox.addChild(tab.controlGroup.group);
+
+    RemoteGui_createTab(getName(), tab.hbox, &tab);
 }
 
 void armarx::nav::components::Navigator::RemoteGui_update()
diff --git a/source/Navigation/components/Navigator/Navigator.h b/source/Navigation/components/Navigator/Navigator.h
index a3ec542b7884cc5d1e862ccd5d36232802c7d4dc..d2c908d7d257188cd45a9e2e162b0c0750ca2eee 100644
--- a/source/Navigation/components/Navigator/Navigator.h
+++ b/source/Navigation/components/Navigator/Navigator.h
@@ -130,6 +130,7 @@ namespace armarx::nav::components
 
         struct RemoteGuiTab : armarx::RemoteGui::Client::Tab
         {
+            armarx::RemoteGui::Client::HBoxLayout hbox;
 
             struct
             {
@@ -151,7 +152,6 @@ namespace armarx::nav::components
                 armarx::RemoteGui::Client::Button pauseButton;
                 armarx::RemoteGui::Client::Button continueButton;
             } controlGroup;
-
         };
         RemoteGuiTab tab;
     };