diff --git a/src/ui/configuration/ApmFirmwareConfig.cc b/src/ui/configuration/ApmFirmwareConfig.cc
index e9e996efdf4d0d68d24b4b23034f1d11f814c135..a7ecbe74bcdb2f1bd9d9ad06e230749040c98591 100644
--- a/src/ui/configuration/ApmFirmwareConfig.cc
+++ b/src/ui/configuration/ApmFirmwareConfig.cc
@@ -1,3 +1,5 @@
+#include <QTimer>
+
 #include "LinkManager.h"
 #include "LinkInterface.h"
 #include "qserialport.h"
@@ -29,21 +31,60 @@ ApmFirmwareConfig::ApmFirmwareConfig(QWidget *parent) : QWidget(parent)
     connect(ui.quadPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked()));
     connect(ui.triPushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked()));
     connect(ui.y6PushButton,SIGNAL(clicked()),this,SLOT(burnButtonClicked()));
-    requestFirmwares();
+    QTimer::singleShot(500,this,SLOT(requestFirmwares()));
     connect(ui.betaFirmwareButton,SIGNAL(clicked(bool)),this,SLOT(betaFirmwareButtonClicked(bool)));
 
     ui.progressBar->setMaximum(100);
     ui.progressBar->setValue(0);
-    ui.progressBar->setVisible(false);
 
     ui.textBrowser->setVisible(false);
     connect(ui.showOutputCheckBox,SIGNAL(clicked(bool)),ui.textBrowser,SLOT(setShown(bool)));
+
+    addBetaLabel(ui.roverPushButton);
+    addBetaLabel(ui.planePushButton);
+    addBetaLabel(ui.copterPushButton);
+    addBetaLabel(ui.quadPushButton);
+    addBetaLabel(ui.hexaPushButton);
+    addBetaLabel(ui.octaQuadPushButton);
+    addBetaLabel(ui.octaPushButton);
+    addBetaLabel(ui.triPushButton);
+    addBetaLabel(ui.y6PushButton);
+
+}
+void ApmFirmwareConfig::hideBetaLabels()
+{
+    for (int i=0;i<m_betaButtonLabelList.size();i++)
+    {
+        m_betaButtonLabelList[i]->hide();
+    }
+    ui.warningLabel->hide();
 }
 
+void ApmFirmwareConfig::showBetaLabels()
+{
+    for (int i=0;i<m_betaButtonLabelList.size();i++)
+    {
+        m_betaButtonLabelList[i]->show();
+    }
+    ui.warningLabel->show();
+}
+
+void ApmFirmwareConfig::addBetaLabel(QWidget *parent)
+{
+
+    QLabel *label = new QLabel(parent);
+    QVBoxLayout *layout = new QVBoxLayout();
+    parent->setLayout(layout);
+    label->setAlignment(Qt::AlignRight | Qt::AlignBottom);
+    label->setText("<h1><font color=#FFAA00>BETA</font></h1>");
+    layout->addWidget(label);
+    m_betaButtonLabelList.append(label);
+}
 
 void ApmFirmwareConfig::requestBetaFirmwares()
 {
     m_betaFirmwareChecked = true;
+    showBetaLabels();
     QNetworkReply *reply1 = m_networkManager->get(QNetworkRequest(QUrl("http://firmware.diydrones.com/Copter/beta/apm2-heli/git-version.txt")));
     QNetworkReply *reply2 = m_networkManager->get(QNetworkRequest(QUrl("http://firmware.diydrones.com/Copter/beta/apm2-quad/git-version.txt")));
     QNetworkReply *reply3 = m_networkManager->get(QNetworkRequest(QUrl("http://firmware.diydrones.com/Copter/beta/apm2-hexa/git-version.txt")));
@@ -89,6 +130,7 @@ void ApmFirmwareConfig::requestBetaFirmwares()
 void ApmFirmwareConfig::requestFirmwares()
 {
     m_betaFirmwareChecked = false;
+    hideBetaLabels();
     QNetworkReply *reply1 = m_networkManager->get(QNetworkRequest(QUrl("http://firmware.diydrones.com/Copter/stable/apm2-heli/git-version.txt")));
     QNetworkReply *reply2 = m_networkManager->get(QNetworkRequest(QUrl("http://firmware.diydrones.com/Copter/stable/apm2-quad/git-version.txt")));
     QNetworkReply *reply3 = m_networkManager->get(QNetworkRequest(QUrl("http://firmware.diydrones.com/Copter/stable/apm2-hexa/git-version.txt")));
@@ -135,15 +177,14 @@ void ApmFirmwareConfig::betaFirmwareButtonClicked(bool betafirmwareenabled)
 {
     if (betafirmwareenabled)
     {
-        QMessageBox::information(0,"Warning","Beta firmwares are from the latest trunk. Use at your own risk!!");
-        ui.label->setText("<h2>Beta Firmware</h2>");
-        ui.betaFirmwareButton->setText("Stable Firmware");
+        ui.label->setText(tr("<h2>Beta Firmware</h2>"));
+        ui.betaFirmwareButton->setText(tr("Stable Firmware"));
         requestBetaFirmwares();
     }
     else
     {
-        ui.label->setText("<h2>Firmware</h2>");
-        ui.betaFirmwareButton->setText("Beta Firmware");
+        ui.label->setText(tr("<h2>Firmware</h2>"));
+        ui.betaFirmwareButton->setText(tr("Beta Firmware"));
         requestFirmwares();
     }
 }
@@ -157,7 +198,7 @@ void ApmFirmwareConfig::firmwareProcessFinished(int status)
     if (status != 0)
     {
         //Error of some kind
-        QMessageBox::information(0,"Error","An error has occured during the upload process. See window for details");
+        QMessageBox::information(0,tr("Error"),tr("An error has occured during the upload process. See window for details"));
         ui.textBrowser->setVisible(true);
         ui.showOutputCheckBox->setChecked(true);
         ui.textBrowser->setPlainText(ui.textBrowser->toPlainText().append("\n\nERROR!!\n" + proc->errorString()));
@@ -166,13 +207,13 @@ void ApmFirmwareConfig::firmwareProcessFinished(int status)
         {
             sb->setValue(sb->maximum());
         }
-        ui.statusLabel->setText("Error during upload");
+        ui.statusLabel->setText(tr("Error during upload"));
     }
     else
     {
         //Ensure we're reading 100%
         ui.progressBar->setValue(100);
-        ui.statusLabel->setText("Upload complete");
+        ui.statusLabel->setText(tr("Upload complete"));
     }
     //qDebug() << "Upload finished!" << QString::number(status);
     m_tempFirmwareFile->deleteLater(); //This will remove the temporary file.
@@ -268,10 +309,10 @@ void ApmFirmwareConfig::downloadFinished()
     port.setDataTerminalReady(false);
     port.close();
 
-    ui.statusLabel->setText("Burning");
     QString avrdudeExecutable;
     QStringList stringList;
 
+    ui.statusLabel->setText(tr("Flashing"));
 #ifdef Q_OS_WIN
     stringList = QStringList() << "-Cavrdude/avrdude.conf" << "-pm2560"
                                << "-cstk500" << QString("-P").append(m_detectedComPort)
@@ -316,7 +357,7 @@ void ApmFirmwareConfig::burnButtonClicked()
                     qDebug() << "Eror, trying to program over a non serial link. This should not happen";
                     return;
                 }
-                if (!(QMessageBox::question(this,"WARNING","You are about to upload new firmware to your board. This will disconnect you if you are currently connected. Be sure the MAV is on the ground, and connected over USB/Serial link.\n\nDo you wish to proceed?",QMessageBox::Yes,QMessageBox::No) == QMessageBox::Yes))
+                if (!(QMessageBox::question(this,tr("WARNING"),tr("You are about to upload new firmware to your board. This will disconnect you if you are currently connected. Be sure the MAV is on the ground, and connected over USB/Serial link.\n\nDo you wish to proceed?"),QMessageBox::Yes,QMessageBox::No) == QMessageBox::Yes))
                 {
                     return;
                 }
@@ -330,7 +371,7 @@ void ApmFirmwareConfig::burnButtonClicked()
         }
         if (!foundconnected)
         {
-            QMessageBox::information(0,"Error","You must be connected to a MAV over serial link to flash firmware. Please connect to a MAV then try again");
+            QMessageBox::information(0,tr("Error"),tr("You must be connected to a MAV over serial link to flash firmware. Please connect to a MAV then try again"));
             return;
         }
 
@@ -342,7 +383,6 @@ void ApmFirmwareConfig::burnButtonClicked()
         connect(reply,SIGNAL(error(QNetworkReply::NetworkError)),this,SLOT(firmwareListError(QNetworkReply::NetworkError)));
         connect(reply,SIGNAL(downloadProgress(qint64,qint64)),this,SLOT(firmwareDownloadProgress(qint64,qint64)));
         ui.statusLabel->setText("Downloading");
-        ui.progressBar->setVisible(true);
     }
 }
 
diff --git a/src/ui/configuration/ApmFirmwareConfig.h b/src/ui/configuration/ApmFirmwareConfig.h
index ae0a5337587fc2137e0d24d1cc18edad8c7fa2ff..9db7d32930a4d7d934a4c3e734722f0e2fe3803e 100644
--- a/src/ui/configuration/ApmFirmwareConfig.h
+++ b/src/ui/configuration/ApmFirmwareConfig.h
@@ -33,13 +33,18 @@ private slots:
     void firmwareProcessReadyRead();
     void firmwareProcessError(QProcess::ProcessError error);
     void firmwareDownloadProgress(qint64 received,qint64 total);
+    void requestFirmwares();
+    void requestBetaFirmwares();
+
 private:
+    void addBetaLabel(QWidget *parent);
+    void hideBetaLabels();
+    void showBetaLabels();
     //ApmFirmwareStatus *firmwareStatus;
     QString m_detectedComPort;
     QTemporaryFile *m_tempFirmwareFile;
     QNetworkAccessManager *m_networkManager;
-    void requestFirmwares();
-    void requestBetaFirmwares();
+    QList<QLabel*> m_betaButtonLabelList;
     bool stripVersionFromGitReply(QString url,QString reply,QString type,QString stable,QString *out);
     bool m_betaFirmwareChecked;
     QMap<QPushButton*,QString> m_buttonToUrlMap;
diff --git a/src/ui/configuration/ApmFirmwareConfig.ui b/src/ui/configuration/ApmFirmwareConfig.ui
index b49f8318c800e13c50f874a5b04f0d370cf7b498..7f4096f4dbc203c2ccdeccd42fa42a3ea47f9a0f 100644
--- a/src/ui/configuration/ApmFirmwareConfig.ui
+++ b/src/ui/configuration/ApmFirmwareConfig.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>868</width>
-    <height>661</height>
+    <height>684</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -448,7 +448,7 @@
    <property name="geometry">
     <rect>
      <x>50</x>
-     <y>470</y>
+     <y>490</y>
      <width>791</width>
      <height>23</height>
     </rect>
@@ -461,7 +461,7 @@
    <property name="geometry">
     <rect>
      <x>60</x>
-     <y>500</y>
+     <y>520</y>
      <width>741</width>
      <height>151</height>
     </rect>
@@ -470,8 +470,8 @@
   <widget class="QCheckBox" name="showOutputCheckBox">
    <property name="geometry">
     <rect>
-     <x>600</x>
-     <y>440</y>
+     <x>710</x>
+     <y>470</y>
      <width>101</width>
      <height>17</height>
     </rect>
@@ -483,7 +483,7 @@
   <widget class="QLabel" name="statusLabel">
    <property name="geometry">
     <rect>
-     <x>60</x>
+     <x>30</x>
      <y>440</y>
      <width>141</width>
      <height>21</height>
@@ -493,6 +493,19 @@
     <string>Status</string>
    </property>
   </widget>
+  <widget class="QLabel" name="warningLabel">
+   <property name="geometry">
+    <rect>
+     <x>180</x>
+     <y>440</y>
+     <width>491</width>
+     <height>16</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>&lt;h3&gt;&lt;font color=#FFAA00&gt;WARNING: Only install BETA firmware if you are an experienced tester.&lt;/font&gt;&lt;/h3&gt;</string>
+   </property>
+  </widget>
  </widget>
  <resources>
   <include location="../../../qgroundcontrol.qrc"/>