diff --git a/plinth/modules/config/__init__.py b/plinth/modules/config/__init__.py
index 6db06b41f..21c70c1e0 100644
--- a/plinth/modules/config/__init__.py
+++ b/plinth/modules/config/__init__.py
@@ -36,6 +36,11 @@ is_essential = True
 
 name = _('General Configuration')
 
+description = [
+    _('Here you can set some general configuration options ',
+      'like hostname, domain name, webserver home page etc.')
+]
+
 depends = ['firewall', 'names']
 
 manual_page = 'Configure'
diff --git a/plinth/templates/setup.html b/plinth/templates/setup.html
index 490e91da4..bd5f15226 100644
--- a/plinth/templates/setup.html
+++ b/plinth/templates/setup.html
@@ -35,45 +35,31 @@
 {% endblock %}
 
 {% block content %}
-  
-  {% if setup_helper.module.icon_filename %}
-  
-    <header class="app-header">
-      <figure>
-        <img src="{% static 'theme/icons/' %}{{ setup_helper.module.icon_filename }}.svg"/>
-        <figcaption>{{ setup_helper.module.name  }}</figcaption>
-      </figure>
-      <section class="app-description">
-        <h2>{% trans "Installation" %}: {{ setup_helper.module.short_description|default:'' }} ({{ setup_helper.module.name }}) </h2>
-    
-        {% for paragraph in setup_helper.module.description %}
-          <p>{{ paragraph|safe }}</p>
-        {% endfor %}
 
-        {% if setup_helper.module.manual_page %}
-          <p class="manual-page">
-            <a href="{% url 'help:manual-page' lang='-' page=setup_helper.module.manual_page %}">
-              {% trans 'Learn more...' %}
-            </a>
-          </p>
-        {% endif %}
-      </section>
-    </header>
-  {% else %}
-    <h2>{% trans "Installation" %}: {{ setup_helper.module.short_description|default:'' }} ({{ setup_helper.module.name }}) </h2>
+  <header class="app-header {% if not setup_helper.module.icon_filename %} app-header-single-column {% endif %}">
 
-    {% for paragraph in setup_helper.module.description %}
-      <p>{{ paragraph|safe }}</p>
-    {% endfor %}
+    {% if setup_helper.module.icon_filename %}
+
+      <img src="{% static 'theme/icons/' %}{{ setup_helper.module.icon_filename }}.svg" alt="{{ setup_helper.module.name  }}"/>
 
-    {% if setup_helper.module.manual_page %}
-      <p class="manual-page">
-        <a href="{% url 'help:manual-page' lang='-' page=setup_helper.module.manual_page %}">
-          {% trans 'Learn more...' %}
-        </a>
-      </p>
     {% endif %}
-  {% endif %}
+
+    <section class="app-description" >
+      <h2>{% trans "Installation" %}: {{ setup_helper.module.short_description|default:'' }} ({{ setup_helper.module.name }}) </h2>
+
+      {% for paragraph in setup_helper.module.description %}
+        <p>{{ paragraph|safe }}</p>
+      {% endfor %}
+
+      {% if setup_helper.module.manual_page %}
+        <p class="manual-page">
+          <a href="{% url 'help:manual-page' lang='-' page=setup_helper.module.manual_page %}">
+            {% trans 'Learn more...' %}
+          </a>
+        </p>
+      {% endif %}
+    </section>
+  </header>
 
   {% include "toolbar.html" with clients=setup_helper.module.clients %}
 
@@ -175,4 +161,4 @@
     {% endif %}
   {% endif %}
 
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 2ea12ad95..3b4cd5e0f 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -545,21 +545,18 @@ a.menu_link_active {
     margin-bottom: 20px;
 }
 
-.app-header > figure {
+.app-header > img {
     margin-top: 25px;
-}
-
-.app-header > figure img {
     width: 100%;
 }
 
-.app-header > figure figcaption {
-    text-align: center;
-    opacity: 0.5;
-    padding: 10px;
-    font-size: 12px;
-}
-
 .app-description {
     grid-column: 2;
 }
+
+.app-header-single-column  {
+    grid-template-columns: 1fr;
+}
+.app-header-single-column .app-description {
+    grid-column: 1;
+}
\ No newline at end of file