diff --git a/images/style-mission.css b/images/style-mission.css
index ee1f1635f07a018dc5de440b2380374abcc950c3..5831e88853c9a6d8cd922d936800b7b87686907d 100644
--- a/images/style-mission.css
+++ b/images/style-mission.css
@@ -77,10 +77,43 @@ border: 1px solid #777777;
      color: #DDDDDF;
  }
  
+ QMainWindow::separator {
+     background: #090909;
+     width: 2px; /* when vertical */
+     height: 2px; /* when horizontal */
+ }
+
+ QMainWindow::separator:hover {
+     background: white;
+ }
+
  QDockWidget {
-	font: bold;
-    border: 1px solid #32345E;
-}
+     border: 1px solid #32345E;
+  /*   titlebar-close-icon: url(close.png);
+     titlebar-normal-icon: url(undock.png);*/
+ }
+
+ QDockWidget::title {
+     text-align: left; /* align the text to the left */
+     background: lightgray;
+     padding-left: 5px;
+ }
+
+ QDockWidget::close-button, QDockWidget::float-button {
+     border: 1px solid transparent;
+     background: darkgray;
+     padding: 0px;
+ }
+
+ QDockWidget::close-button:hover, QDockWidget::float-button:hover {
+     background: gray;
+ }
+
+ QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
+     padding: 1px -1px -1px 1px;
+ }
+
+
 
 QDockWidget::close-button, QDockWidget::float-button {
 	background-color: #181820;
diff --git a/src/ui/DebugConsole.ui b/src/ui/DebugConsole.ui
index 191cb1092830b3f44e50100b5544856d05d95853..833c490be5f17a458e060930ff751c3bfcc06ab2 100644
--- a/src/ui/DebugConsole.ui
+++ b/src/ui/DebugConsole.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>435</width>
+    <width>402</width>
     <height>185</height>
    </rect>
   </property>
@@ -77,14 +77,24 @@
         <string>Enable auto hold to lower the CPU consumption</string>
        </property>
        <property name="text">
-        <string>Auto hold</string>
+        <string>Hold</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="1" column="0" colspan="2">
-    <widget class="QPlainTextEdit" name="receiveText"/>
+    <widget class="QPlainTextEdit" name="receiveText">
+     <property name="minimumSize">
+      <size>
+       <width>300</width>
+       <height>50</height>
+      </size>
+     </property>
+     <property name="tabStopWidth">
+      <number>60</number>
+     </property>
+    </widget>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="QLineEdit" name="sentText">
@@ -98,13 +108,22 @@
    </item>
    <item row="3" column="0">
     <widget class="QLineEdit" name="sendText">
+     <property name="minimumSize">
+      <size>
+       <width>80</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="toolTip">
       <string>Type the bytes to send here, use 0xAA format for HEX (Check HEX checkbox above)</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="10,10,10">
+     <property name="spacing">
+      <number>5</number>
+     </property>
      <item>
       <widget class="QPushButton" name="transmitButton">
        <property name="toolTip">
diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index 9b82d7f0332dbd9688df8671e2fd8dfe240d11dd..9b567a1b8408e0c45070d90239e012007364cd4b 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -83,7 +83,7 @@ MainWindow::MainWindow(QWidget *parent) :
     configureWindowName();
 
     // Add status bar
-    setStatusBar(createStatusBar());
+    //setStatusBar(createStatusBar());
 
     // Set the application style (not the same as a style sheet)
     // Set the style to Plastique
@@ -131,7 +131,7 @@ void MainWindow::buildWidgets()
 
     // Center widgets
     linechartWidget   = new Linecharts(this);
-    hudWidget         = new HUD(640, 480, this);
+    hudWidget         = new HUD(320, 240, this);
     mapWidget         = new MapWidget(this);
     protocolWidget    = new XMLCommProtocolWidget(this);
     dataplotWidget    = new QGCDataPlot2D(this);
@@ -340,12 +340,12 @@ void MainWindow::reloadStylesheet()
 
 void MainWindow::showStatusMessage(const QString& status, int timeout)
 {
-    statusBar->showMessage(status, timeout);
+    //statusBar->showMessage(status, timeout);
 }
 
 void MainWindow::showStatusMessage(const QString& status)
 {
-    statusBar->showMessage(status, 5);
+    //statusBar->showMessage(status, 5);
 }
 
 /**
diff --git a/src/ui/ParameterInterface.ui b/src/ui/ParameterInterface.ui
index daaa2e6bc84ce879756c1fe64b89ca2e1d1ca818..9faf772ee492c5fb7b9688a2a4e7fb215fe81a15 100644
--- a/src/ui/ParameterInterface.ui
+++ b/src/ui/ParameterInterface.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>350</width>
-    <height>545</height>
+    <width>335</width>
+    <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/ui/QGCSensorSettingsWidget.ui b/src/ui/QGCSensorSettingsWidget.ui
index 40be710d9afa9c9472a8f347ce6507a3e4c87f8f..df1f2e78a1452e128a0175eaaa9686c0b0095906 100644
--- a/src/ui/QGCSensorSettingsWidget.ui
+++ b/src/ui/QGCSensorSettingsWidget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>319</width>
+    <width>231</width>
     <height>221</height>
    </rect>
   </property>
@@ -22,7 +22,7 @@
      <property name="title">
       <string>Calibration Wizards</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout" columnstretch="5,5">
+     <layout class="QGridLayout" name="gridLayout" columnstretch="100,100">
       <property name="leftMargin">
        <number>6</number>
       </property>
@@ -44,28 +44,28 @@
       <item row="0" column="0">
        <widget class="QPushButton" name="rcCalButton">
         <property name="text">
-         <string>RC Calibration</string>
+         <string>RC Cal.</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QPushButton" name="magCalButton">
         <property name="text">
-         <string>Mag. Calibration</string>
+         <string>Mag. Cal.</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QPushButton" name="gyroCalButton">
         <property name="text">
-         <string>Gyro Calibration</string>
+         <string>Gyro Cal.</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QPushButton" name="pressureCalButton">
         <property name="text">
-         <string>Pressure Calibration</string>
+         <string>Pressure Cal.</string>
         </property>
        </widget>
       </item>
@@ -99,7 +99,7 @@
       <item row="0" column="0">
        <widget class="QCheckBox" name="sendRawCheckBox">
         <property name="text">
-         <string>RAW Sensor Data</string>
+         <string>RAW Sensors</string>
         </property>
        </widget>
       </item>
@@ -113,14 +113,14 @@
       <item row="4" column="0">
        <widget class="QCheckBox" name="sendPositionCheckBox">
         <property name="text">
-         <string>Position setpoint</string>
+         <string>Position CTRL</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0">
        <widget class="QCheckBox" name="sendControllerCheckBox">
         <property name="text">
-         <string>Raw Controller</string>
+         <string>Attitude CTRL</string>
         </property>
        </widget>
       </item>
diff --git a/src/ui/UASControl.ui b/src/ui/UASControl.ui
index 458df4cbfc07fc17826a11a4eb4849cd32c7e6ec..38cc2fcb9546ead361f889e9b248d99e184ffca8 100644
--- a/src/ui/UASControl.ui
+++ b/src/ui/UASControl.ui
@@ -6,44 +6,53 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>287</width>
-    <height>354</height>
+    <width>210</width>
+    <height>130</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>280</width>
-    <height>170</height>
+    <width>210</width>
+    <height>130</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" rowminimumheight="10,20,0,10,10,10,300">
-   <property name="leftMargin">
-    <number>6</number>
-   </property>
-   <property name="topMargin">
-    <number>12</number>
+  <layout class="QGridLayout" name="gridLayout" rowstretch="10,10,0,10,10,5,100" columnstretch="0,0,10,10,10,0">
+   <property name="margin">
+    <number>0</number>
    </property>
-   <property name="rightMargin">
-    <number>6</number>
-   </property>
-   <property name="bottomMargin">
+   <property name="spacing">
     <number>6</number>
    </property>
    <item row="0" column="1" colspan="4">
     <widget class="QLabel" name="controlStatusLabel">
+     <property name="minimumSize">
+      <size>
+       <width>50</width>
+       <height>20</height>
+      </size>
+     </property>
      <property name="text">
       <string>UNCONNECTED</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
     </widget>
    </item>
    <item row="1" column="1" colspan="4">
     <widget class="QPushButton" name="controlButton">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>12</height>
+      </size>
+     </property>
      <property name="text">
       <string>Activate Engine</string>
      </property>
@@ -80,6 +89,12 @@
    </item>
    <item row="3" column="1">
     <widget class="QPushButton" name="liftoffButton">
+     <property name="minimumSize">
+      <size>
+       <width>80</width>
+       <height>12</height>
+      </size>
+     </property>
      <property name="text">
       <string>Liftoff</string>
      </property>
@@ -91,6 +106,12 @@
    </item>
    <item row="3" column="2" colspan="2">
     <widget class="QPushButton" name="landButton">
+     <property name="minimumSize">
+      <size>
+       <width>80</width>
+       <height>12</height>
+      </size>
+     </property>
      <property name="text">
       <string>Land</string>
      </property>
@@ -102,6 +123,12 @@
    </item>
    <item row="3" column="4">
     <widget class="QPushButton" name="shutdownButton">
+     <property name="minimumSize">
+      <size>
+       <width>80</width>
+       <height>12</height>
+      </size>
+     </property>
      <property name="text">
       <string>Halt</string>
      </property>
@@ -125,10 +152,23 @@
     </spacer>
    </item>
    <item row="4" column="1" colspan="2">
-    <widget class="QComboBox" name="modeComboBox"/>
+    <widget class="QComboBox" name="modeComboBox">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>12</height>
+      </size>
+     </property>
+    </widget>
    </item>
    <item row="4" column="3" colspan="2">
     <widget class="QPushButton" name="setModeButton">
+     <property name="minimumSize">
+      <size>
+       <width>40</width>
+       <height>12</height>
+      </size>
+     </property>
      <property name="text">
       <string>Set Mode</string>
      </property>
@@ -140,6 +180,12 @@
    </item>
    <item row="5" column="1" colspan="4">
     <widget class="QLabel" name="lastActionLabel">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>12</height>
+      </size>
+     </property>
      <property name="text">
       <string>No actions executed so far</string>
      </property>
diff --git a/src/ui/UASInfo.ui b/src/ui/UASInfo.ui
index a86c9a2623c27ad2c2a54915c61e67acdba7933f..79c468415217217845239ad31a8e88f7e059d688 100644
--- a/src/ui/UASInfo.ui
+++ b/src/ui/UASInfo.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>455</width>
-    <height>220</height>
+    <width>223</width>
+    <height>138</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,9 +16,12 @@
   <property name="styleSheet">
    <string notr="true"/>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0,100" columnstretch="0,0,0,0,0,0,0">
    <property name="margin">
-    <number>6</number>
+    <number>3</number>
+   </property>
+   <property name="spacing">
+    <number>5</number>
    </property>
    <item row="0" column="0">
     <widget class="QLabel" name="label">
diff --git a/src/ui/UASView.ui b/src/ui/UASView.ui
index 203c312927fca72e2856253b9d0750b0a12bb232..ceadfa1b901bd2e244fdaa86e2f9f12a42da4dde 100644
--- a/src/ui/UASView.ui
+++ b/src/ui/UASView.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>370</width>
-    <height>120</height>
+    <width>335</width>
+    <height>121</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>370</width>
+    <width>335</width>
     <height>0</height>
    </size>
   </property>
diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc
index b7615b78f4c9f06662dd7cb6fd4a149dc2c0432a..4b5cbd1edc91c530fe25f3898eeb1869e836a597 100644
--- a/src/ui/linechart/LinechartWidget.cc
+++ b/src/ui/linechart/LinechartWidget.cc
@@ -70,7 +70,7 @@ updateTimer(new QTimer())
 {
     // Add elements defined in Qt Designer
     ui.setupUi(this);
-    this->setMinimumSize(600, 300);
+    this->setMinimumSize(400, 250);
 
     // Add and customize curve list elements (left side)
     curvesWidget = new QWidget(ui.curveListWidget);