diff --git a/src/views/app.html b/src/views/app.html
index 12a3e0d43..7ef282f9f 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -494,20 +494,22 @@
       <div class="card" ng-show="view === 'updates'">
         <div class="row">
           <div class="col-md-12">
-            Last updated <span class="app-info-meta text-small">{{ app.updateTime | prettyDate }}</span>
+            <label class="control-label">Updates</label>
+            <p>This app is running {{ app.manifest.title }} {{ app.upstreamVersion }} (Package <a ng-href="/#/appstore/{{app.manifest.id}}?version={{app.manifest.version}}">v{{ app.manifest.version }}</a>) and was last updated <code>{{ app.updateTime | prettyDate }}</code>.</p>
             <br/>
-            Automatic Updates <span class="app-info-meta text-small">{{ updates.enableAutomaticUpdate ? 'Enabled' : 'Disabled' }}</span>
-            <br/>
-            <br/>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-md-12">
-            <button class="btn btn-primary" ng-class="{ 'btn-danger': updates.enableAutomaticUpdate }" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busy"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busy"></i> {{ updates.enableAutomaticUpdate ? 'Disable' : 'Enable' }} Automatic Updates</button>
             <button class="btn btn-primary pull-right" ng-click="updates.check()" ng-hide="config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version" ng-disabled="updates.busyCheck"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busyCheck"></i> Check for Updates</button>
             <button class="btn btn-success pull-right" ng-click="updates.askUpdate()" ng-show="app.installationState !== 'pending_update' && config.update.apps[app.id].manifest.version && config.update.apps[app.id].manifest.version !== app.manifest.version" ng-disabled="app.taskId || !(app | installSuccess)">Update Available</button>
           </div>
         </div>
+        <hr/>
+        <div class="row">
+          <div class="col-md-12">
+            <label class="control-label">Automatic Updates</label>
+            <p>Cloudron periodically polls the App Store to check for updates. If you disable automatic updates, be sure to manually check for updates.</p>
+            <p>Automatic Updates is currently <b>{{ updates.enableAutomaticUpdate ? 'enabled' : 'disabled' }}</b>.</p>
+            <button class="btn btn-primary pull-right" ng-class="{ 'btn-danger': updates.enableAutomaticUpdate }" ng-click="updates.toggleAutomaticUpdates()" ng-disabled="updates.busy"><i class="fa fa-circle-notch fa-spin" ng-show="updates.busy"></i> {{ updates.enableAutomaticUpdate ? 'Disable' : 'Enable' }} Automatic Updates</button>
+          </div>
+        </div>
       </div>
 
       <div class="card"ng-show="view === 'backups'">