diff --git a/plinth/modules/upgrades/templates/upgrades.html b/plinth/modules/upgrades/templates/upgrades.html
index f347d23fc..6bc6f0391 100644
--- a/plinth/modules/upgrades/templates/upgrades.html
+++ b/plinth/modules/upgrades/templates/upgrades.html
@@ -35,35 +35,30 @@
 
   {% if result %}
 
-    {% if result.error %}
-      <div class="alert alert-danger" role="alert">
-	{% trans "There was an error while upgrading." %}
-      </div>
+    {% if result.return_code %}
+      <p>
+        {% trans "There was an error while upgrading." %}
+      </p>
 
       <h5>{% trans "Output from unattended-upgrades:" %}</h5>
-
       <pre>{{ result.error }}</pre>
-    {% endif %}
-
-    {% if result.output %}
-      <div class="row">
-	<div class="col-lg-6">
-          <div class="alert alert-success" role="alert">
-            {% trans "The operating system is up to date now. &nbsp;" %}
-              <button type="button" class="btn btn-default show-details"
-                      style='display:none'>
-		{% trans "Show Details" %}
-		<div class="caret"></div>
-              </button>
-          </div>
-	</div>
-      </div>
+      {% if result.output %}
+        <pre>{{ result.output }}</pre>
+      {% endif %}
+    {% else %}
+      <p>
+        {% trans "The operating system is up to date now. &nbsp;" %}
+        <button type="button" class="btn btn-default show-details"
+                style='display: none;'>
+          {% trans "Show Details" %}
+          <div class="caret"></div>
+        </button>
+      </p>
 
       <div class="details">
-	<h5>{% trans "Output from unattended-upgrades:" %}</h5>
-	<pre>{{ result.output }}</pre>
+        <h5>{% trans "Output from unattended-upgrades:" %}</h5>
+        <pre>{{ result.output }}</pre>
       </div>
-
     {% endif %}
 
   {% endif %}
@@ -89,7 +84,7 @@
   {% if running %}
     <p class="running-status-parent">
       <span class="running-status active"></span>
-      {% trans "Upgrade is running" %}
+      {% trans "System is being upgraded." %}
     </p>
   {% endif %}
 
diff --git a/plinth/modules/upgrades/views.py b/plinth/modules/upgrades/views.py
index 4d1d9bccc..6e83faf8c 100644
--- a/plinth/modules/upgrades/views.py
+++ b/plinth/modules/upgrades/views.py
@@ -69,10 +69,7 @@ def index(request):
 @package.required(['unattended-upgrades'], on_install=on_install)
 def upgrade(request):
     """Serve the upgrade page."""
-    if upgrade_process:
-        result = _collect_upgrade_result(request)
-    else:
-        result = None
+    result = _collect_upgrade_result(request)
 
     return TemplateResponse(request, 'upgrades.html',
                             {'title': _('Package Upgrades'),
@@ -135,7 +132,7 @@ def _collect_upgrade_result(request):
     return_code = upgrade_process.poll()
 
     # Upgrade process is not complete yet
-    if return_code == None:
+    if return_code is None:
         return
 
     output, error = upgrade_process.communicate()
@@ -144,7 +141,7 @@ def _collect_upgrade_result(request):
     if not return_code:
         messages.success(request, _('Upgrade completed.'))
     else:
-        messages.info(request, _('Upgrade failed.'))
+        messages.error(request, _('Upgrade failed.'))
 
     upgrade_process = None