diff --git a/plinth/modules/upgrades/templates/upgrades.html b/plinth/modules/upgrades/templates/upgrades.html
index 1f9f4e031..2ea20b2fa 100644
--- a/plinth/modules/upgrades/templates/upgrades.html
+++ b/plinth/modules/upgrades/templates/upgrades.html
@@ -1,4 +1,4 @@
-{% extends 'app-subsubmenu.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -32,7 +32,9 @@
 {% endblock %}
 
 
-{% block configuration %}
+{% block content %}
+
+  <h2>{{ title }}</h2>
 
   {% if not is_busy %}
   <p>
diff --git a/plinth/modules/upgrades/templates/upgrades_configure.html b/plinth/modules/upgrades/templates/upgrades_configure.html
index bbe32f5fb..6761d2486 100644
--- a/plinth/modules/upgrades/templates/upgrades_configure.html
+++ b/plinth/modules/upgrades/templates/upgrades_configure.html
@@ -1,4 +1,4 @@
-{% extends "app-subsubmenu.html" %}
+{% extends "app.html" %}
 {% comment %}
 #
 # This file is part of FreedomBox.
@@ -21,15 +21,9 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block configuration %}
-
-  <form class="form" method="post">
-    {% csrf_token %}
-
-    {{ form|bootstrap }}
-
-    <input type="submit" class="btn btn-primary btn-md"
-           value="{% trans "Update setup" %}"/>
-  </form>
-
+{% block status %}
+  <a href="{% url 'upgrades:upgrade' %}" class="btn btn-default"
+     role="button" title="{% trans 'Manual update' %}">
+    {% trans 'Manual update' %}
+  </a>
 {% endblock %}
diff --git a/plinth/modules/upgrades/views.py b/plinth/modules/upgrades/views.py
index 45761df7a..0b3b7e48e 100644
--- a/plinth/modules/upgrades/views.py
+++ b/plinth/modules/upgrades/views.py
@@ -22,39 +22,26 @@ from django.contrib import messages
 from django.template.response import TemplateResponse
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy
 from django.views.generic.edit import FormView
 
 from plinth import actions
 from plinth.errors import ActionError
 from plinth.modules import upgrades
+from plinth.views import AppView
 
 from .forms import ConfigureForm
 
-subsubmenu = [{
-    'url': reverse_lazy('upgrades:index'),
-    'text': ugettext_lazy('Auto-update')
-},
-              {
-                  'url': reverse_lazy('upgrades:upgrade'),
-                  'text': ugettext_lazy('Manual update')
-              }]
 
-
-class UpgradesConfigurationView(FormView):
+class UpgradesConfigurationView(AppView):
     """Serve configuration page."""
     form_class = ConfigureForm
     success_url = reverse_lazy('upgrades:index')
     template_name = "upgrades_configure.html"
-
-    def get_context_data(self, *args, **kwargs):
-        """Return the context data for rendering the template view."""
-        context = super().get_context_data(*args, **kwargs)
-        context['subsubmenu'] = subsubmenu
-        context['title'] = upgrades.name
-        context['description'] = upgrades.description
-        context['manual_page'] = upgrades.manual_page
-        return context
+    app_id = 'upgrades'
+    name = upgrades.name
+    description = upgrades.description
+    manual_page = upgrades.manual_page
+    show_status_block = False
 
     def get_initial(self):
         return {'auto_upgrades_enabled': upgrades.is_enabled()}
@@ -87,7 +74,7 @@ class UpgradesConfigurationView(FormView):
         else:
             messages.info(self.request, _('Settings unchanged'))
 
-        return super().form_valid(form)
+        return FormView.form_valid(self, form)
 
 
 def is_package_manager_busy():
@@ -116,12 +103,8 @@ def upgrade(request):
         except ActionError:
             messages.error(request, _('Starting upgrade failed.'))
 
-    return TemplateResponse(
-        request, 'upgrades.html', {
-            'title': upgrades.name,
-            'description': upgrades.description,
-            'manual_page': upgrades.manual_page,
-            'subsubmenu': subsubmenu,
-            'is_busy': is_busy,
-            'log': get_log()
-        })
+    return TemplateResponse(request, 'upgrades.html', {
+        'title': _('Manual update'),
+        'is_busy': is_busy,
+        'log': get_log()
+    })