diff --git a/samples/blackgui/mainwindow.cpp b/samples/blackgui/mainwindow.cpp
index 6779db084..6b9edd31f 100644
--- a/samples/blackgui/mainwindow.cpp
+++ b/samples/blackgui/mainwindow.cpp
@@ -453,4 +453,5 @@ void MainWindow::reloadAllUsers()
     this->m_allUsers->update(this->m_contextNetwork->getUsers());
     this->ui->tv_AllUsers->resizeColumnsToContents();
     this->ui->tv_AllUsers->resizeRowsToContents();
+    this->ui->tv_AllUsers->horizontalHeader()->setStretchLastSection(true);
 }
diff --git a/samples/blackgui/mainwindow.ui b/samples/blackgui/mainwindow.ui
index 48c8ca344..53d2cd127 100644
--- a/samples/blackgui/mainwindow.ui
+++ b/samples/blackgui/mainwindow.ui
@@ -414,7 +414,7 @@ QSizeGrip {
           <enum>QFrame::NoFrame</enum>
          </property>
          <property name="currentIndex">
-          <number>7</number>
+          <number>4</number>
          </property>
          <widget class="QWidget" name="pg_StatusPage">
           <property name="sizePolicy">
@@ -1299,28 +1299,18 @@ QSizeGrip {
                </item>
               </widget>
              </item>
-             <item row="2" column="4">
-              <spacer name="vs_CockpitSelcal">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>32</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
              <item row="3" column="4">
               <spacer name="vs_CockpitTransponder">
                <property name="orientation">
                 <enum>Qt::Vertical</enum>
                </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
                <property name="sizeHint" stdset="0">
                 <size>
                  <width>20</width>
-                 <height>32</height>
+                 <height>28</height>
                 </size>
                </property>
               </spacer>
@@ -1381,6 +1371,22 @@ QSizeGrip {
                </property>
               </widget>
              </item>
+             <item row="2" column="4">
+              <spacer name="vs_CockpitSelcal">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>28</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
             </layout>
            </item>
            <item>
diff --git a/samples/blackgui/mainwindow_cockpit.cpp b/samples/blackgui/mainwindow_cockpit.cpp
index cbfa32a6a..b3d6ebca5 100644
--- a/samples/blackgui/mainwindow_cockpit.cpp
+++ b/samples/blackgui/mainwindow_cockpit.cpp
@@ -124,9 +124,12 @@ void MainWindow::updateCockpitFromContext()
         this->m_usersVoiceCom1->update(this->m_contextVoice->getCom1RoomUsers());
         this->ui->tv_CockpitVoiceRoom1->resizeColumnsToContents();
         this->ui->tv_CockpitVoiceRoom1->resizeRowsToContents();
+        this->ui->tv_CockpitVoiceRoom1->horizontalHeader()->setStretchLastSection(true);
+
         this->m_usersVoiceCom2->update(this->m_contextVoice->getCom2RoomUsers());
         this->ui->tv_CockpitVoiceRoom2->resizeColumnsToContents();
         this->ui->tv_CockpitVoiceRoom2->resizeRowsToContents();
+        this->ui->tv_CockpitVoiceRoom2->horizontalHeader()->setStretchLastSection(true);
 
         // display URL if not override mode
         if (!this->ui->cb_CockpitVoiceRoom1Override->isChecked())
diff --git a/samples/blackgui/mainwindow_init.cpp b/samples/blackgui/mainwindow_init.cpp
index 8192e9786..b26c6498c 100644
--- a/samples/blackgui/mainwindow_init.cpp
+++ b/samples/blackgui/mainwindow_init.cpp
@@ -99,6 +99,7 @@ void MainWindow::init(GuiModes::CoreMode coreMode)
         this->ui->tv_AllUsers->horizontalHeader()->setSortIndicator(this->m_allUsers->getSortColumn(), this->m_allUsers->getSortOrder());
     this->ui->tv_AllUsers->resizeColumnsToContents();
     this->ui->tv_AllUsers->resizeRowsToContents();
+    this->ui->tv_AllUsers->horizontalHeader()->setStretchLastSection(true);
 
     this->ui->tv_CockpitVoiceRoom1->setSortingEnabled(true);
     this->ui->tv_CockpitVoiceRoom1->setModel(this->m_usersVoiceCom1);
@@ -107,6 +108,7 @@ void MainWindow::init(GuiModes::CoreMode coreMode)
         this->ui->tv_CockpitVoiceRoom1->horizontalHeader()->setSortIndicator(this->m_usersVoiceCom1->getSortColumn(), this->m_usersVoiceCom1->getSortOrder());
     this->ui->tv_CockpitVoiceRoom1->resizeColumnsToContents();
     this->ui->tv_CockpitVoiceRoom1->resizeRowsToContents();
+    this->ui->tv_CockpitVoiceRoom1->horizontalHeader()->setStretchLastSection(true);
 
     this->ui->tv_CockpitVoiceRoom2->setSortingEnabled(true);
     this->ui->tv_CockpitVoiceRoom2->setModel(this->m_usersVoiceCom2);
@@ -115,6 +117,7 @@ void MainWindow::init(GuiModes::CoreMode coreMode)
         this->ui->tv_CockpitVoiceRoom2->horizontalHeader()->setSortIndicator(this->m_usersVoiceCom2->getSortColumn(), this->m_usersVoiceCom2->getSortOrder());
     this->ui->tv_CockpitVoiceRoom2->resizeColumnsToContents();
     this->ui->tv_CockpitVoiceRoom2->resizeRowsToContents();
+    this->ui->tv_CockpitVoiceRoom2->horizontalHeader()->setStretchLastSection(true);
 
     // timer
     if (this->m_timerUpdateAircraftsInRange == nullptr) this->m_timerUpdateAircraftsInRange = new QTimer(this);