diff --git a/plinth/modules/first_boot/templates/firstboot_complete.html b/plinth/modules/first_boot/templates/firstboot_complete.html
index f5a72cc14..550cad061 100644
--- a/plinth/modules/first_boot/templates/firstboot_complete.html
+++ b/plinth/modules/first_boot/templates/firstboot_complete.html
@@ -21,33 +21,29 @@
 {% load bootstrap %}
 {% load i18n %}
 
-{% block content_row %}
+{% block content %}
 
-  <div class="col-lg-6 col-lg-offset-3">
-    {% include 'messages.html' %}
+  <h2>{% trans "Setup Complete!" %}</h2>
 
-    <h2>{% trans "Setup Complete!" %}</h2>
+  <p>
+    {% blocktrans trimmed %}
+      Without any apps, your {{ box_name }} cannot do very much.
+    {% endblocktrans %}
+  </p>
 
-    <p>
-      {% blocktrans trimmed %}
-        Without any apps, your {{ box_name }} cannot do very much.
-      {% endblocktrans %}
-    </p>
-
-    <div class="text-center">
-      <a class="btn btn-lg btn-primary" href="{% url 'apps' %}">
-        {% trans "Install Apps" %}</a>
-    </div>
-
-    <p>
-      <p>
-        {% url 'networks:index' as networks_url %}
-        {% blocktrans trimmed %}
-          You may want to check the <a href="{{ networks_url }}">network
-          setup</a> and modify it if necessary.
-        {% endblocktrans %}
-      </p>
-    </p>
+  <div class="text-center">
+    <a class="btn btn-lg btn-primary" href="{% url 'apps' %}">
+      {% trans "Install Apps" %}</a>
   </div>
 
+  <p>
+    <p>
+      {% url 'networks:index' as networks_url %}
+      {% blocktrans trimmed %}
+        You may want to check the <a href="{{ networks_url }}">network
+        setup</a> and modify it if necessary.
+      {% endblocktrans %}
+    </p>
+  </p>
+
 {% endblock %}
diff --git a/plinth/modules/first_boot/templates/firstboot_welcome.html b/plinth/modules/first_boot/templates/firstboot_welcome.html
index 83741826f..23d18110d 100644
--- a/plinth/modules/first_boot/templates/firstboot_welcome.html
+++ b/plinth/modules/first_boot/templates/firstboot_welcome.html
@@ -30,7 +30,7 @@
   </style>
 {% endblock %}
 
-{% block content_row %}
+{% block content %}
   <p class="text-center">
     <img src="{% static 'theme/img/FreedomBox-logo-standard.png' %}"
          alt="{{ box_name }}" width="640"/>