diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp
--- a/src/widgets/atcoreinstancewidget.cpp
+++ b/src/widgets/atcoreinstancewidget.cpp
@@ -35,20 +35,15 @@
     ui = new Ui::AtCoreInstanceWidget;
     ui->setupUi(this);
 
-    auto layout = new QHBoxLayout();
     m_axisControl = new AxisControl();
-    layout->addWidget(m_axisControl);
-    ui->gridLayout_3->addLayout(layout, 2, 2, Qt::AlignHCenter);
+    m_axisControl->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+    ui->controlsLayout->addWidget(m_axisControl);
 
     m_plotWidget = new PlotWidget();
-    layout = new QHBoxLayout();
-    layout->addWidget(m_plotWidget);
-    ui->gridLayout_3->addLayout(layout, 3, 0, 1, 3, Qt::AlignHCenter);
+    ui->controlTabLayout->addWidget(m_plotWidget);
 
     m_logWidget = new LogWidget(new QTemporaryFile(QDir::tempPath() + QStringLiteral("/Atelier_")));
-    layout = new QHBoxLayout();
-    layout->addWidget(m_logWidget);
-    ui->gridLayout_2->addLayout(layout, 2, 0, Qt::AlignHCenter);
+    ui->advancedTabLayout->addWidget(m_logWidget);
 
     m_sdWidget = new SdWidget;
 
diff --git a/src/widgets/atcoreinstancewidget.ui b/src/widgets/atcoreinstancewidget.ui
--- a/src/widgets/atcoreinstancewidget.ui
+++ b/src/widgets/atcoreinstancewidget.ui
@@ -26,26 +26,30 @@
       <attribute name="title">
        <string>Controllers</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="4" column="0" colspan="4">
+      <layout class="QVBoxLayout" name="controlTabLayout">
+       <item>
         <widget class="PrintProgressWidget" name="printProgressWidget" native="true"/>
        </item>
-       <item row="2" column="0">
-        <widget class="BedExtruderWidget" name="bedExtWidget" native="true"/>
+       <item>
+       <layout class="QHBoxLayout" name="controlsLayout">
+        <item>
+            <widget class="BedExtruderWidget" name="bedExtWidget" native="true"/>
+        </item>
+       </layout>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="advancedTab">
       <attribute name="title">
        <string>Advanced</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="1" column="0">
-        <widget class="PushGCodeWidget" name="pushGCodeWidget" native="true"/>
-       </item>
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="advancedTabLayout">
+       <item>
         <widget class="RatesControlWidget" name="ratesControlWidget" native="true"/>
        </item>
+       <item>
+        <widget class="PushGCodeWidget" name="pushGCodeWidget" native="true"/>
+       </item>
       </layout>
      </widget>
     </widget>