diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 8450f2d0a..568e7b53b 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -212,7 +212,7 @@
     <div id="container-wrapper" class="container">
       <div class="row">
         {% block content_row %}
-          <div class="col-md-6">
+          <div class="col-md-8 col-md-offset-2">
             {% block subsubmenu %}
               {% if subsubmenu %}
                 {% show_subsubmenu subsubmenu %}
diff --git a/plinth/templates/cards.html b/plinth/templates/cards.html
index 6d7fb2c12..bb6f1d6ea 100644
--- a/plinth/templates/cards.html
+++ b/plinth/templates/cards.html
@@ -24,13 +24,13 @@
 {% block container %}
   <div class="container">
     <div class="row">
-      <div class="col-md-6 col-md-offset-3">
+      <div class="col-md-8 col-md-offset-2">
         {% include 'messages.html' %}
       </div>
     </div>
   </div>
 
-  <div id="container-wrapper" class="container-fluid">
+  <div class="container-fluid">
     <div class="row">
       <div class="card-list">
 
diff --git a/plinth/templates/index.html b/plinth/templates/index.html
index dcca2482c..1189cb5f5 100644
--- a/plinth/templates/index.html
+++ b/plinth/templates/index.html
@@ -33,7 +33,7 @@
 
   <div class="container">
     <div class="row">
-      <div class="col-md-6 col-md-offset-3">
+      <div class="col-md-8 col-md-offset-2">
 
         {% include 'messages.html' %}