diff --git a/public_html/media/css/core.css b/public_html/media/css/core.css
index d89d76c2..955f7a3a 100644
--- a/public_html/media/css/core.css
+++ b/public_html/media/css/core.css
@@ -152,7 +152,7 @@ footer a {
 #sidebar {
 	float: left;
 	width: 256px;
-	margin-right: 2em;
+	margin-right: 1em;
 }
 #sidebar h1 {
 	margin-top: 0;
@@ -174,29 +174,36 @@ footer a {
 	padding-bottom: 2em;
 }
 
-.small-screen #sidebar {
-	float: none;
-	width: 100%;
-	padding: 0 0 1em 0;
-}
-.small-screen #inner-content {
-	float: none;
-	width: auto;
-}
-
-.bottom-unit {
-	padding: 0.5em 1em;
+.unit {
+	padding: 1em;
 	border: 1px solid #eee;
+	margin: 1em 0;
+}
+#inner-content .unit {
 	border-bottom: 0;
 	padding-bottom: 0;
-	margin: 1em 0 2em 0;
 }
-.left-unit {
-	margin: 0 0 1.5em 0;
-	padding: 0.75em;
-	border: 1px solid #eee;
-	padding-left: 0;
+#sidebar .unit {
 	border-left: 0;
+	padding-left: 0;
+}
+#small-screen { display: none; }
+
+@media only screen and (max-width:700px) {
+	#small-screen { display: block; }
+	body #sidebar {
+		float: none;
+		width: 100%;
+	}
+	body #sidebar .unit {
+		border: 1px solid #eee;
+		border-bottom: 0;
+		padding: 1em 1em 0 1em;
+	}
+	#inner-content {
+		float: none;
+		width: auto;
+	}
 }
 
 
diff --git a/public_html/media/js/core.js b/public_html/media/js/core.js
index e1487223..aab75a5f 100644
--- a/public_html/media/js/core.js
+++ b/public_html/media/js/core.js
@@ -148,19 +148,10 @@ $(function()
 //modify DOM on small viewports
 function processSidebar()
 {
-	$('#inner-content .unit').addClass('bottom-unit');
-	if ($('body').width() < 600)
-	{
-		$('body').addClass('small-screen');
+	if ($('#small-screen').is(':visible'))
 		$('#sidebar').insertAfter($('#inner-content'));
-		$('#sidebar .unit').removeClass('left-unit').addClass('bottom-unit');
-	}
 	else
-	{
-		$('body').removeClass('small-screen');
 		$('#sidebar').insertBefore($('#inner-content'));
-		$('#sidebar .unit').removeClass('bottom-unit').addClass('left-unit');
-	}
 }
 $(function()
 {
diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml
index 2a2d02e6..ab9a90cf 100644
--- a/src/Views/layout-normal.phtml
+++ b/src/Views/layout-normal.phtml
@@ -73,5 +73,7 @@
 				$('body').trigger('dom-update');
 			});
 		</script>
+
+		<div id="small-screen"></div>
 	</body>
 </html>