diff --git a/src/views/settings.html b/src/views/settings.html
index 2f449fb93..ea4c2670f 100644
--- a/src/views/settings.html
+++ b/src/views/settings.html
@@ -168,20 +168,20 @@
           <tr>
             <td colspan="2">&nbsp;</td>
           </tr>
-          <tr>
-            <td colspan="2">&nbsp;</td>
+          <tr ng-show="!update.busy && update.errorMessage">
+            <td class="text-muted" style="vertical-align: top;">Update Error:</td>
+            <td class="text-right has-error" style="vertical-align: top; white-space: nowrap;">{{ update.errorMessage }}</td>
           </tr>
-          <tr>
-            <td class="text-muted" style="vertical-align: top;">
-              <div ng-show="update.busy" class="progress progress-striped active animateMe">
+          <tr ng-show="update.busy">
+            <td colspan="2">
+              <div class="progress progress-striped active animateMe" style="margin-bottom: 10px;">
                 <div class="progress-bar progress-bar-success" role="progressbar" style="width: {{update.percent}}%"></div>
               </div>
-              <div>
-                <div ng-show="update.busy">{{ update.message }}</div>
-                <div class="has-error" ng-show="!update.busy && update.errorMessage">{{ update.errorMessage }}</div>
-              </div>
+              <div>{{ update.message }}</div>
             </td>
-            <td class="text-right" style="vertical-align: bottom;">
+          </tr>
+          <tr>
+            <td colspan="2" style="padding-top: 10px;">
               <button class="btn btn-primary pull-right" ng-show="!config.update.box && !update.busy" ng-disabled="autoUpdate.busy" ng-click="autoUpdate.checkNow()"><i class="fa fa-circle-notch fa-spin" ng-show="autoUpdate.busy"></i> Check for Updates</button>
               <button class="btn btn-success pull-right" ng-show="config.update.box && !update.busy" ng-click="update.show()">Update Available</button>
               <button class="btn btn-danger pull-right" ng-show="config.update.box && update.busy" ng-click="update.stopUpdate()">Stop Update</button>
diff --git a/src/views/settings.js b/src/views/settings.js
index 7d40b658e..a984e9b02 100644
--- a/src/views/settings.js
+++ b/src/views/settings.js
@@ -29,7 +29,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
         error: {}, // this is for the dialog
         busy: false,
         percent: 0,
-        message: '',
+        message: 'Downloading',
         errorMessage: '', // this shows inline
         taskId: '',