diff --git a/plinth/modules/first_boot/templates/firstboot_sidebar.html b/plinth/modules/first_boot/templates/firstboot_sidebar.html
index 1d00104b7..7c398d80f 100644
--- a/plinth/modules/first_boot/templates/firstboot_sidebar.html
+++ b/plinth/modules/first_boot/templates/firstboot_sidebar.html
@@ -17,7 +17,7 @@
 #
 {% endcomment %}
 
-<div class="well sidebar">
+<div class="sidebar">
 
   <h3>Getting Help</h3>
 
diff --git a/plinth/modules/help/templates/help_about.html b/plinth/modules/help/templates/help_about.html
index af577a2fb..7bfab1f18 100644
--- a/plinth/modules/help/templates/help_about.html
+++ b/plinth/modules/help/templates/help_about.html
@@ -50,7 +50,7 @@ href="http://wiki.debian.org/FreedomBox" target="_blank">Learn more
 
 {% block sidebar %}
 
-<div class="well sidebar">
+<div class="sidebar">
 
   <h3>Our Goal</h3>
 
diff --git a/plinth/modules/owncloud/templates/owncloud.html b/plinth/modules/owncloud/templates/owncloud.html
index 326e63f14..b5242d5ed 100644
--- a/plinth/modules/owncloud/templates/owncloud.html
+++ b/plinth/modules/owncloud/templates/owncloud.html
@@ -41,7 +41,7 @@
 
 {% block sidebar %}
 
-  <div class="well sidebar">
+  <div class="sidebar">
 
     <h3>ownCloud</h3>
 
diff --git a/plinth/modules/packages/templates/packages.html b/plinth/modules/packages/templates/packages.html
index 172fbac5a..6254df28d 100644
--- a/plinth/modules/packages/templates/packages.html
+++ b/plinth/modules/packages/templates/packages.html
@@ -48,7 +48,7 @@
 
 {% block sidebar %}
 
-  <div class="well sidebar">
+  <div class="sidebar">
 
     <h3>Help</h3>
 
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index 7d43c2457..2860c9516 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -82,7 +82,7 @@ port-forwarded, if necessary:</p>
 
 {% block sidebar %}
 
-  <div class="well sidebar">
+  <div class="sidebar">
 
     <h3>Tor</h3>
 
diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index 9efb18fdd..73d1f8f62 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -131,9 +131,9 @@
       <div class="col-md-3">
         {% block submenu %}
           {% if submenu %}
-            <div class="well sidebar">
+            <div class="sidebar">
               {% include "submenu.html" with menu=submenu %}
-            </div><!--/.well -->
+            </div><!--/.sidebar -->
           {% endif %}
         {% endblock %}
 
@@ -143,20 +143,17 @@
       </div>
 
       <div class="col-md-9">
-        <div class="well">
+        {% block subsubmenu %}
+          {% if subsubmenu %}
+            {% show_subsubmenu subsubmenu %}
+          {% endif %}
+        {% endblock %}
 
-          {% block subsubmenu %}
-            {% if subsubmenu %}
-              {% show_subsubmenu subsubmenu %}
-            {% endif %}
-          {% endblock %}
+        {% include 'messages.html' %}
 
-          {% include 'messages.html' %}
-
-          {% block content %}
-            {# main content goes here #}
-          {% endblock %}
-        </div>
+        {% block content %}
+          {# main content goes here #}
+        {% endblock %}
       </div><!--/col-->
     </div><!--/row-->