diff --git a/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c b/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c
index 311f1d623..2eee44859 100644
--- a/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c
+++ b/ground/openpilotgcs/src/libs/glc_lib/3rdparty/lib3ds/light.c
@@ -30,8 +30,6 @@
 /*!
  * \defgroup light Lights
  */
-/*!
-
 
 /*!
  * \ingroup light
diff --git a/ground/openpilotgcs/src/plugins/config/ahrs.ui b/ground/openpilotgcs/src/plugins/config/ahrs.ui
index e41c73afd..a9ad4ca32 100644
--- a/ground/openpilotgcs/src/plugins/config/ahrs.ui
+++ b/ground/openpilotgcs/src/plugins/config/ahrs.ui
@@ -110,7 +110,6 @@
              </layout>
             </item>
            </layout>
-           <zorder></zorder>
           </widget>
          </item>
          <item>
diff --git a/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp b/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp
index 1678e64a5..f965b5ad3 100644
--- a/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/hitlnew/hitlwidget.cpp
@@ -46,23 +46,23 @@ HITLWidget::HITLWidget(QWidget *parent)
 	: QWidget(parent),
 	simulator(0)
 {
-    widget = new Ui_HITLWidget();
-    widget->setupUi(this);
+	widget = new Ui_HITLWidget();
+	widget->setupUi(this);
 	widget->startButton->setEnabled(true);
 	widget->stopButton->setEnabled(false);
 
 	greenColor = "rgb(35, 221, 35)";
 
-	strAutopilotDisconnected = " Autopilot disconnected ";
-	strSimulatorDisconnected = " Simulator disconnected ";
-	strAutopilotConnected = " Autopilot connected ";
-	strSimulatorConnected = " Simulator connected ";
+	strAutopilotDisconnected = " Autopilot OFF ";
+	strSimulatorDisconnected = " Simulator OFF ";
+	strAutopilotConnected = " Autopilot ON ";
+	strSimulatorConnected = " Simulator ON ";
 
 	widget->apLabel->setText(strAutopilotDisconnected);
 	widget->simLabel->setText(strSimulatorDisconnected);
 
-    connect(widget->startButton, SIGNAL(clicked()), this, SLOT(startButtonClicked()));
-    connect(widget->stopButton, SIGNAL(clicked()), this, SLOT(stopButtonClicked()));
+	connect(widget->startButton, SIGNAL(clicked()), this, SLOT(startButtonClicked()));
+	connect(widget->stopButton, SIGNAL(clicked()), this, SLOT(stopButtonClicked()));
 	connect(widget->buttonClearLog, SIGNAL(clicked()), this, SLOT(buttonClearLogClicked()));
 
 }
@@ -188,10 +188,9 @@ void HITLWidget::buttonClearLogClicked()
 
 void HITLWidget::onAutopilotConnect()
 {
-	widget->simLabel->setStyleSheet(QString::fromUtf8("QFrame{\n""background-color: %1; color: white}").arg(greenColor));
-
+	widget->apLabel->setStyleSheet(QString::fromUtf8("QFrame{\n""background-color: %1; color: white}").arg(greenColor));
 	widget->apLabel->setText(strAutopilotConnected);
-    qxtLog->info("HITL: Autopilot connected, initializing for HITL simulation");
+	qxtLog->info("HITL: Autopilot connected, initializing for HITL simulation");
 }
 
 void HITLWidget::onAutopilotDisconnect()
@@ -214,5 +213,3 @@ void HITLWidget::onSimulatorDisconnect()
 	widget->simLabel->setText(" " + simulator->Name() +" disconnected ");
 	qxtLog->info(QString("HITL: %1 disconnected").arg(simulator->Name()));
 }
-
-
diff --git a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui
index 3d6d77045..b3f48432a 100644
--- a/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui
+++ b/ground/openpilotgcs/src/plugins/notify/notifypluginoptionspage.ui
@@ -31,7 +31,7 @@
    <property name="title">
     <string>Sound Collection</string>
    </property>
-   <widget class="QWidget" name="layoutWidget">
+   <widget class="QWidget" name="layoutWidget_2">
     <property name="geometry">
      <rect>
       <x>10</x>