diff --git a/src/theme.scss b/src/theme.scss
index e6810add3..8aa49ec99 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -434,7 +434,7 @@ multiselect {
 
 .task-indicator {
     position: fixed;
-    left: 20px;
+    right: 20px;
     top: 65px;
     background: white;
     padding: 10px;
@@ -445,6 +445,41 @@ multiselect {
     }
 }
 
+.app-configure-links {
+    position: fixed;
+    left: 20px;
+    top: 65px;
+
+    div {
+        cursor: pointer;
+        display: block;
+        padding: 6px 10px;
+        margin: 0;
+        overflow: hidden;
+        color: black;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 16px;
+
+        &:hover,
+        &:focus,
+        &.category-active {
+            text-decoration: none;
+            background-color: white;
+            color: black;
+        }
+
+        &.category-active {
+            background-color: $navbar-default-link-hover-color;
+            color: white;
+        }
+
+        & > i {
+            width: 30px;
+        }
+    }
+}
+
 // ----------------------------
 // Appstore view
 // ----------------------------
diff --git a/src/views/app.html b/src/views/app.html
index 6cfd71d74..3ef53336e 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -12,10 +12,20 @@
   <div class="task-indicator animateMe" ng-show="app.taskId">
     <i class="fa fa-circle-notch fa-spin"></i>
     <span>{{ app | installationStateLabel:user }}</span>
-    <button class="btn btn-sm btn-danger" ng-click="stopAppTask(app.taskId)">Cancel</button>
   </div>
 
-  <div>
+  <div class="app-configure-links">
+    <div ng-click="scrollTo('overview')">Overview</div>
+    <div ng-click="scrollTo('display')">Display</div>
+    <div ng-click="scrollTo('location')">Location</div>
+    <div ng-click="scrollTo('access')">Access Control</div>
+    <div ng-click="scrollTo('resources')">Resources</div>
+    <div ng-click="scrollTo('security')">Security</div>
+    <div ng-click="scrollTo('updates')">Updates</div>
+    <div ng-click="scrollTo('backups')">Backups</div>
+  </div>
+
+  <div id="overview">
     <h1>
       <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 }}
@@ -48,12 +58,14 @@
           </tr>
         </table>
         <br/>
-        <a class="btn btn-outline btn-primary pull-right" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
+        <a class="btn btn-outline btn-primary" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
+        <a class="btn btn-outline btn-primary" ng-href="{{ '/logs.html?appId=' + app.id }}" target="_blank">Logs</a>
+        <button class="btn btn-danger pull-right" ng-show="app.taskId" ng-click="stopAppTask(app.taskId)">Cancel Current Task</button>
       </div>
     </div>
   </div>
 
-  <div><h3>Display</h3></div>
+  <div id="display"><h3>Display</h3></div>
   <div class="card">
     <div class="row">
       <div class="col-md-12">
@@ -95,7 +107,7 @@
     </div>
   </div>
 
-  <div><h3>Location</h3></div>
+  <div id="location"><h3>Location</h3></div>
   <div class="card">
     <div class="row">
       <div class="col-md-12">
@@ -191,7 +203,7 @@
     </div>
   </div>
 
-  <div><h3>Access Control</h3></div>
+  <div id="access"><h3>Access Control</h3></div>
   <div class="card">
     <div class="row">
       <div class="col-md-12">
@@ -259,7 +271,7 @@
     </div>
   </div>
 
-  <div><h3>Resources</h3></div>
+  <div id="resources"><h3>Resources</h3></div>
   <div class="card">
     <div class="row">
       <div class="col-md-12">
@@ -297,7 +309,7 @@
     </div>
   </div>
 
-  <div ng-if="app.manifest.addons.sendmail || app.manifest.addons.recvmail"><h3>Email</h3></div>
+  <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="row">
       <div class="col-md-12">
@@ -341,7 +353,7 @@
     </div>
   </div>
 
-  <div><h3>Security</h3></div>
+  <div id="security"><h3>Security</h3></div>
   <div class="card">
     <div class="row">
       <div class="col-md-12">
@@ -368,7 +380,7 @@
     </div>
   </div>
 
-  <div><h3>Updates</h3></div>
+  <div id="updates"><h3>Updates</h3></div>
   <div class="card">
     <div class="row">
       <div class="col-md-12">
@@ -395,7 +407,7 @@
     </div>
   </div>
 
-  <div><h3>Backups</h3></div>
+  <div id="backups"><h3>Backups</h3></div>
   <div class="card">
     <div class="row">
       <div class="col-md-12">
diff --git a/src/views/app.js b/src/views/app.js
index 2e8796ed3..422560f3f 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -28,6 +28,11 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
         });
     };
 
+    $scope.scrollTo = function (elemId) {
+        var elem = document.getElementById(elemId);
+        elem.scrollIntoView();
+    };
+
     $scope.display = {
         busy: false,
         error: {},