diff --git a/src/theme.scss b/src/theme.scss
index 24c39d5d8..58867deb5 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -498,6 +498,7 @@ multiselect {
     background-color: white;
     z-index: 7;
     opacity: 0.5;
+    cursor: not-allowed;
 }
 
 // ----------------------------
diff --git a/src/views/app.html b/src/views/app.html
index 0d346f7a7..05fd47bb3 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -23,6 +23,7 @@
     <div ng-click="scrollTo('security')">Security</div>
     <div ng-click="scrollTo('updates')">Updates</div>
     <div ng-click="scrollTo('backups')">Backups</div>
+    <div ng-click="scrollTo('debug')">Debug</div>
   </div>
 
   <br/>
@@ -30,7 +31,7 @@
   <div class="card">
     <div class="row">
       <div class="col-md-12">
-        <h2 style="margin-top: 10px;">
+        <h2 style="margin-top: 0;">
           <img ng-src="{{ app.iconUrl || 'img/appicon_fallback.png' }}" fallback-icon="img/appicon_fallback.png" onerror="imageErrorHandler(this)" class="app-icon"/>
           {{ app.label || app.location || app.fqdn }}
         </h2>
@@ -63,9 +64,8 @@
         </p>
         <br/>
         <div>
-          <button class="btn btn-warning" ng-hide="app.taskId" ng-click="restartApp()" ng-disabled="appIsRestarting"><i class="fa fa-circle-notch fa-spin" ng-show="appIsRestarting"></i> Restart App</button>
-          <button class="btn btn-danger" ng-show="app.taskId" ng-click="stopAppTask(app.taskId)">Cancel Current Task</button>
-          <a class="btn btn-outline btn-primary pull-right" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank">Logs</a>
+          <button class="btn btn-danger" ng-click="confirmUninstall()">Uninstall</button>
+          <a class="btn btn-outline btn-primary pull-right" ng-href="https://{{ app.fqdn }}" target="_blank"><i class="fas fa-external-link-alt"></i> Open App</a>
           <a class="btn btn-outline btn-primary pull-right" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
         </div>
       </div>
@@ -112,7 +112,7 @@
 
   <div id="location"><h3>Location</h3></div>
   <div class="card">
-    <div class="task-active-overlay" ng-show="app.installationState === 'pending_location_change'">
+    <div class="task-active-overlay" ng-show="app.taskId">
       <h1><i class="fa fa-circle-notch fa-spin"></i></h1>
     </div>
     <div class="row">
@@ -275,6 +275,9 @@
 
   <div id="resources"><h3>Resources</h3></div>
   <div class="card">
+    <div class="task-active-overlay" ng-show="app.taskId">
+      <h1><i class="fa fa-circle-notch fa-spin"></i></h1>
+    </div>
     <div class="row">
       <div class="col-md-12">
         <fieldset>
@@ -313,6 +316,9 @@
 
   <div id="email" ng-if="app.manifest.addons.sendmail || app.manifest.addons.recvmail"><h3>Email</h3></div>
   <div class="card" ng-if="app.manifest.addons.sendmail || app.manifest.addons.recvmail">
+    <div class="task-active-overlay" ng-show="app.taskId">
+      <h1><i class="fa fa-circle-notch fa-spin"></i></h1>
+    </div>
     <div class="row">
       <div class="col-md-12">
         <fieldset>
@@ -436,4 +442,16 @@
     </div>
   </div>
 
+  <div id="debug"><h3>Debug</h3></div>
+  <div class="card">
+    <div class="row">
+      <div class="col-md-12">
+        <button class="btn btn-danger" ng-show="app.taskId" ng-click="stopAppTask(app.taskId)">Cancel Current Task</button>
+        <button class="btn btn-danger" ng-hide="app.taskId" ng-click="restartApp()" ng-disabled="appIsRestarting"><i class="fa fa-circle-notch fa-spin" ng-show="appIsRestarting"></i> Restart App</button>
+        <a class="btn btn-primary pull-right" ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank">Terminal</a>
+        <a class="btn btn-primary pull-right" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank">Logs</a>
+      </div>
+    </div>
+  </div>
+
 </div>
diff --git a/src/views/apps.html b/src/views/apps.html
index 7276202b8..dfa501c76 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -609,8 +609,6 @@
                 <a href="" ng-hide="app | activeTask" ng-click="appUninstall.show(app)" uib-tooltip="Uninstall" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-times scale"></i></a>
                 <a href="" ng-hide="!backupsEnabled || (app | activeTask)" ng-click="appRestore.show(app)" uib-tooltip="Backups" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-archive scale"></i></a>
                 <a ng-href="#/app/{{ app.id}}" uib-tooltip="Configure" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-wrench scale"></i></a>
-                <a ng-href="{{ '/terminal.html?id=' + app.id }}" target="_blank" uib-tooltip="Terminal" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-terminal scale"></i></a>
-                <a ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank" uib-tooltip="Logs" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-file-alt scale"></i></a>
                 <a href="" ng-click="showInformation(app)" uib-tooltip="Information" tooltip-placement="right" tooltip-class="app-tooltip"><i class="fa fa-info-circle scale"></i></a>
               </div>