diff --git a/theme/bootstrap/layout/general.php b/theme/bootstrap/layout/general.php
index d416e1530af..b6aa0237a9a 100644
--- a/theme/bootstrap/layout/general.php
+++ b/theme/bootstrap/layout/general.php
@@ -131,29 +131,36 @@ echo $OUTPUT->doctype() ?>
 
 <?php if ($layout !== 'content-only') {
           if ($layout === 'pre-and-post') { ?>
-            <aside id="region-pre" class="span4 block-region desktop-first-column region-content">
+            <aside class="span4 desktop-first-column">
     <?php } else if ($layout === 'side-pre-only') { ?>
-            <aside id="region-pre" class="span3 block-region desktop-first-column region-content">
+            <aside class="span3 desktop-first-column">
     <?php } ?>
+          <div id="region-pre" class="block-region">
+          <div class="region-content">
           <?php
                 if (!right_to_left()) {
                     echo $OUTPUT->blocks_for_region('side-pre');
                 } else if ($hassidepost) {
                     echo $OUTPUT->blocks_for_region('side-post');
-                }
-            ?>
-            </aside>
+                } ?>
+          </div>
+          </div>
+          </aside>
     <?php if ($layout === 'pre-and-post') {
           ?></div></div><?php // Close row-fluid and span9.
    }
 
     if ($layout === 'side-post-only' OR $layout === 'pre-and-post') { ?>
-        <aside id="region-post" class="span3 block-region region-content">
+        <aside class="span3">
+        <div id="region-post" class="block-region">
+        <div class="region-content">
         <?php if (!right_to_left()) {
                   echo $OUTPUT->blocks_for_region('side-post');
               } else {
                   echo $OUTPUT->blocks_for_region('side-pre');
               } ?>
+        </div>
+        </div>
         </aside>
     <?php } ?>
 <?php } ?>