diff --git a/src/views/app.html b/src/views/app.html
index 54c1e794f..fa806389c 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -682,22 +682,19 @@
       </div>
 
       <div class="card" ng-show="view === 'debug'">
-        <div class="row">
+        <div class="row" ng-hide="true">
           <div class="col-md-12">
             <label class="control-label">Status</label>
             <div>
                 Version
-                <span class="app-info-meta text-small">{{ app.upstreamVersion }} (Package <a ng-href="/#/appstore/{{app.manifest.id}}?version={{app.manifest.version}}">v{{ app.manifest.version }}</a>) </span>
+                <span class="app-info-meta text-small">{{ app.manifest.title }} {{ app.upstreamVersion }} (Package <a ng-href="/#/appstore/{{app.manifest.id}}?version={{app.manifest.version}}">v{{ app.manifest.version }}</a>) </span>
                 <br/>
                 App ID <span class="app-info-meta  text-small">{{ app.id }}</a> </span>
                 <br/>
                 Installed <span class="app-info-meta  text-small">{{ app.creationTime | prettyDate }}</a> </span>
-                <br/>
-                <span ng-show="app.error" class="text-danger"><br/>Error: <b>{{ app.error.message }}</b><br/></span>
             </div>
           </div>
         </div>
-        <hr/>
         <div class="row">
           <div class="col-md-12">
             <label class="control-label">Console Access</label>
@@ -709,12 +706,22 @@
         <hr/>
         <div class="row">
           <div class="col-md-12">
-            <label class="control-label">Repair</label>
+            <label class="control-label">Start / Stop</label>
             <p>If the app is not responding, try restarting the app.</p>
-            <button class="btn btn-success" ng-click="repair.show()" ng-show="app.error">Repair App</button>
-            <button class="btn btn-success pull-right" ng-class="{ 'btn-danger': app.runState === 'running' }" ng-click="debug.toggleRunState()" ng-disabled="app.taskId || debug.busyRunState"><i class="fa fa-circle-notch fa-spin" ng-show="debug.appIsRestarting"></i>
+            <button class="btn btn-success pull-right" ng-class="{ 'btn-danger': app.runState === 'running' }" ng-click="debug.toggleRunState()" ng-disabled="app.taskId || app.error || debug.busyRunState"><i ng-show="debug.busyRunState" class="fa fa-circle-notch fa-spin"></i>
               {{ app.runState === 'running' ? 'Stop App' : 'Start App' }}
             </button>
+          </div>
+        </div>
+        <hr/>
+        <div class="row">
+          <div class="col-md-12">
+            <label class="control-label">Repair</label>
+            <p>Use the repair button to retry failed operations.</p>
+
+            <p ng-show="app.error">An error occurred during the previous operation: <span class="text-danger"><b>{{ app.error.message }}</b></span></p>
+            <button class="btn btn-success pull-right" ng-click="repair.show()" ng-disabled="!app.error">Repair</button>
+
             <button class="btn btn-danger pull-right" ng-click="debug.stopAppTask(app.taskId)" ng-show="app.taskId">Cancel Current Task</button>
           </div>
         </div>