diff --git a/plinth/modules/help/templates/help_index.html b/plinth/modules/help/templates/help_index.html
index 1d08ab091..8df3c1bd5 100644
--- a/plinth/modules/help/templates/help_index.html
+++ b/plinth/modules/help/templates/help_index.html
@@ -22,44 +22,44 @@
 {% load firstboot_extras %}
 {% load static %}
 
-{% block content %}
-<div id="container-wrapper" class="container thumbnail">
-  <h2>{% trans "Help" %}</h2>
+{% block content-container %}
+  <div class="container content-container">
+    <h2>{% trans "Help" %}</h2>
 
-  <p>
-    {% url 'help:manual' as manual_url %}
-    {% blocktrans trimmed %}
-      The <a href="{{ manual_url }}">{{ box_name }} Manual</a> is the
-      best place to start for information regarding {{ box_name }}.
-    {% endblocktrans %}
-  </p>
+    <p>
+      {% url 'help:manual' as manual_url %}
+      {% blocktrans trimmed %}
+        The <a href="{{ manual_url }}">{{ box_name }} Manual</a> is the
+        best place to start for information regarding {{ box_name }}.
+      {% endblocktrans %}
+    </p>
 
-  <p>
-    {% blocktrans trimmed %}
-      <a href="http://wiki.debian.org/FreedomBox" target="_blank">
-        {{ box_name }} project wiki </a> contains further information.
-    {% endblocktrans %}
-  </p>
+    <p>
+      {% blocktrans trimmed %}
+        <a href="http://wiki.debian.org/FreedomBox" target="_blank">
+          {{ box_name }} project wiki </a> contains further information.
+      {% endblocktrans %}
+    </p>
 
-  <p>
-    {% blocktrans trimmed %}
-      To seek help from {{ box_name }} community, queries may be posted on
-      the
-      <a href="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">
-      mailing list</a>.  The list archives also contain information
-      about problems faced by other users and possible solutions.
-    {% endblocktrans %}
-  </p>
+    <p>
+      {% blocktrans trimmed %}
+        To seek help from {{ box_name }} community, queries may be posted on
+        the
+        <a href="https://lists.alioth.debian.org/mailman/listinfo/freedombox-discuss">
+        mailing list</a>.  The list archives also contain information
+        about problems faced by other users and possible solutions.
+      {% endblocktrans %}
+    </p>
 
-  <p>
-    {% blocktrans trimmed %}
-      Many {{ box_name }} contributors and users are also available on
-      the irc.oftc.net IRC network.  Join and request help on the
-      <a href="https://webchat.oftc.net/?randomnick=1&channels=freedombox&prompt=1">
-      #freedombox</a> channel using the IRC web interface.
-    {% endblocktrans %}
-  </p>
-</div>
+    <p>
+      {% blocktrans trimmed %}
+        Many {{ box_name }} contributors and users are also available on
+        the irc.oftc.net IRC network.  Join and request help on the
+        <a href="https://webchat.oftc.net/?randomnick=1&channels=freedombox&prompt=1">
+        #freedombox</a> channel using the IRC web interface.
+      {% endblocktrans %}
+    </p>
+  </div>
 {% endblock %}
 
 
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 72a780366..2e6ea7687 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -219,7 +219,7 @@
   </div>
 
   {% block container %}
-    <div id="container-wrapper" class="container thumbnail">
+    <div class="container content-container">
         {% block content_row %}
             {% block subsubmenu %}
               {% if subsubmenu %}
diff --git a/plinth/templates/cards.html b/plinth/templates/cards.html
index a819332bb..70489ae80 100644
--- a/plinth/templates/cards.html
+++ b/plinth/templates/cards.html
@@ -30,7 +30,7 @@
     </div>
   </div>
 
-  <div class="container-fluid">
+  <div class="container-fluid card-container">
     <div class="row">
       <div class="card-list">
 
@@ -54,12 +54,7 @@
     </div>
   </div>
 
-  <div id="container-wrapper" class="container">
-
-        {% block content %}
-        {# main content goes here #}
-        {% endblock %}
-
-  </div>
+  {% block content-container %}
+  {% endblock %}
 
 {% endblock %}
diff --git a/plinth/templates/index.html b/plinth/templates/index.html
index 93967258f..a376f8555 100644
--- a/plinth/templates/index.html
+++ b/plinth/templates/index.html
@@ -71,7 +71,7 @@
   </div>
 
   {% if shortcuts %}
-    <div id="container-wrapper" class="container-fluid">
+    <div class="container-fluid card-container">
       <div class="row">
         <div class="card-list">
           {% for shortcut in shortcuts %}
diff --git a/plinth/templates/service-subsubmenu.html b/plinth/templates/service-subsubmenu.html
index 8ee744ab8..304dcdebf 100644
--- a/plinth/templates/service-subsubmenu.html
+++ b/plinth/templates/service-subsubmenu.html
@@ -24,7 +24,7 @@
 {% load static %}
 
 {% block container %}
-  <div id="container-wrapper" class="container thumbnail">
+  <div class="container content-container">
     {% block content_row %}
 
       {% include 'messages.html' %}
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 01fee2fee..d00b272d7 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -176,8 +176,11 @@ html {
   max-width: 1000px;
 }
 
-.container.thumbnail {
-    padding: 5px 50px 50px;
+.content-container {
+    padding: 25px 50px 50px;
+    background-color: white;
+    border: 1px solid #ddd;
+    border-radius: 4px;
 }
 
 footer {
@@ -371,10 +374,6 @@ a.menu_link_active {
     font-size: 80px;
 }
 
-.container.thumbnail {
-  padding: 5px 50px 50px;
-}
-
 /* Button table - Tables with a list of actions as buttons on top */
 .button-table > .button-row + .table {
     margin-top: 10px;