diff --git a/plinth/modules/first_boot/templates/firstboot_state10.html b/plinth/modules/first_boot/templates/firstboot_state10.html
index a1f7cb553..b03096d83 100644
--- a/plinth/modules/first_boot/templates/firstboot_state10.html
+++ b/plinth/modules/first_boot/templates/firstboot_state10.html
@@ -29,35 +29,32 @@
     <h2>{% trans "Setup Complete!" %}</h2>
 
     <p>
-      {% blocktrans trimmed %}
-        FreedomBox setup is now complete.  However, you should check
-        the network setup and modify it if necessary.  Do not forget
-        to change the default Wi-Fi passwords.
+      {% blocktrans trimmed with box_name=cfg.box_name %}
+        {{ box_name }} setup is now complete.  To make your FreedomBox
+        functional, you need some applications.  Applications will be
+        installed the first time you access them.
       {% endblocktrans %}
     </p>
 
+    <div class="text-center">
+      <a class="btn btn-lg btn-primary" href="{% url 'apps:index' %}">
+        {% trans "Go to Apps" %}</a>
+    </div>
+
+    <h3>{% trans "Current Network Configuration" %}</h3>
+
     <p>
       {% blocktrans trimmed %}
-        To make your FreedomBox functional, you need some
-        applications.  Applications will be installed the first time
-        you access them.
+        You should check the network setup and modify it if necessary.
+        Do not forget to change the default Wi-Fi passwords!
       {% endblocktrans %}
     </p>
 
-    <h3>{% trans "Network Configuration" %}</h3>
-
     {% include "connections_diagram.html" %}
 
-    <div class="row">
-      <div class="col-xs-6 text-center">
-        <a class="btn btn-lg btn-primary" href="{% url 'networks:index' %}">
-          {% trans "Go to Networks" %}</a>
-      </div>
-
-      <div class="col-xs-6 text-center">
-        <a class="btn btn-lg btn-primary" href="{% url 'apps:index' %}">
-          {% trans "Go to Apps" %}</a>
-      </div>
+    <div class="text-center">
+      <a class="btn btn-lg btn-primary" href="{% url 'networks:index' %}">
+        {% trans "Go to Networks" %}</a>
     </div>
   </div>