diff --git a/src/js/client.js b/src/js/client.js
index 0d0797035..1db80ac8d 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -500,6 +500,29 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
         });
     };
 
+    Client.prototype.restartApp = function (id, callback) {
+        var that = this;
+
+        function waitUntilStopped(callback) {
+            that.getApp(id, function (error, result) {
+                if (error) return callback(error);
+
+                if (result.runState === 'stopped') return callback();
+                setTimeout(waitUntilStopped.bind(null, callback), 2000);
+            });
+        }
+
+        that.stopApp(id, function (error) {
+            if (error) return callback(error);
+
+            waitUntilStopped(function (error) {
+                if (error) return callback(error);
+
+                that.startApp(id, callback);
+            });
+        });
+    };
+
     Client.prototype.debugApp = function (id, state, callback) {
         var data = {
             appId: id,
diff --git a/src/theme.scss b/src/theme.scss
index 9555d341a..24c39d5d8 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -30,9 +30,9 @@ $btn-info-bg:                               $btn-default-bg;
 $btn-info-color:                            $brand-info !default;
 $btn-info-border:                           $brand-info !default;
 
-$btn-warning-bg:                            #333 !default;
-$btn-warning-color:                         $brand-warning !default;
-$btn-warning-border:                        $brand-warning !default;
+// $btn-warning-bg:                            #333 !default;
+// $btn-warning-color:                         $brand-warning !default;
+// $btn-warning-border:                        $brand-warning !default;
 
 $btn-danger-bg:                             $btn-default-bg;
 $btn-danger-color:                          $brand-danger !default;
@@ -130,6 +130,10 @@ input[type="checkbox"] {
     text-overflow: ellipsis;
 }
 
+.btn.pull-right {
+    margin-left: 5px;
+}
+
 // ----------------------------
 // Main classes
 // ----------------------------
diff --git a/src/views/app.html b/src/views/app.html
index 76e44f882..0d346f7a7 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -30,38 +30,44 @@
   <div class="card">
     <div class="row">
       <div class="col-md-12">
-        <h1>
+        <h2 style="margin-top: 10px;">
           <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 }}
-        </h1>
+        </h2>
+
         <br/>
+
+        <p>
+          {{ app.manifest.title }}
+          <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>
+          <br/>
+          App ID <span class="app-info-meta  text-small">{{ app.id }}</a> </span>
+          <br/>
+          Last updated <span class="app-info-meta text-small">{{ app.updateTime | prettyDate }}</span>
+        </p>
+
         <br/>
-        <table width="100%">
-          <tr>
-            <td class="text-muted" style="vertical-align: top;">Status</td>
-            <td class="text-right" style="vertical-align: top;">{{ app | installationStateLabel:user }}</td>
-          </tr>
-          <tr>
-            <td class="text-muted" style="vertical-align: top;">App ID</td>
-            <td class="text-right" style="vertical-align: top;">{{ app.id }}</td>
-          </tr>
-          <tr>
-            <td class="text-muted" style="vertical-align: top;">Upstream Version</td>
-            <td class="text-right" style="vertical-align: top;">{{ app.upstreamVersion }}</td>
-          </tr>
-          <tr>
-            <td class="text-muted" style="vertical-align: top;">App Package</td>
-            <td class="text-right" style="vertical-align: top;">{{ app.manifest.title }}</td>
-          </tr>
-          <tr>
-            <td class="text-muted" style="vertical-align: top;">App Package Version</td>
-            <td class="text-right" style="vertical-align: top;">{{ app.manifest.version }}</td>
-          </tr>
-        </table>
+
+        <p ng-show="app.manifest && app.manifest.postInstallMessage">
+          <b>Usage Information</b><br/>
+          <div ng-bind-html="app.manifest.postInstallMessage | postInstallMessage:app | markdown2html"></div>
+        </p>
+
         <br/>
-        <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>
+
+        <p ng-show="app.manifest.addons.localstorage.ftp">
+          <b>SFTP</b> <sup><a ng-href="{{ config.webServerOrigin }}/documentation/apps/#ftp-access" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup><br/>
+          Server: {{ config.adminFqdn }}<br/>
+          Port: 222<br/>
+          Username: {{ user.username }}@{{ app.fqdn }}<br/>
+        </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>
+          <a class="btn btn-outline btn-primary pull-right" ng-href="{{ app.manifest.documentationUrl }}" target="_blank">Documentation</a>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/views/app.js b/src/views/app.js
index 0289899db..69689faa7 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -11,6 +11,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
     $scope.app = null;
     $scope.activeTask = null;
+    $scope.appIsRestarting = false;
     $scope.ready = false;
     $scope.HOST_PORT_MIN = 1024;
     $scope.HOST_PORT_MAX = 65535;
@@ -24,7 +25,17 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
     $scope.stopAppTask = function (taskId) {
         Client.stopTask(taskId, function (error) {
-            if (error) return Client.error(error);
+            if (error) Client.error(error);
+        });
+    };
+
+    $scope.restartApp = function () {
+        $scope.appIsRestarting = true;
+
+        Client.restartApp($scope.app.id, function (error) {
+            if (error) Client.error(error);
+
+            $scope.appIsRestarting = false;
         });
     };