diff --git a/frontend/rewrite.php b/frontend/rewrite.php
index 52865b7..e22d723 100644
--- a/frontend/rewrite.php
+++ b/frontend/rewrite.php
@@ -255,8 +255,7 @@ $sTemplateParameters = array_merge($sTemplateParameters, array(
 	'logged-in'		=> $sLoggedIn,
 	'title'			=> $sPageTitle,
 	'main'			=> $sMainContents,
-	/* TODO: Return a boolean instead and use this in the template. */
-	'main-class'		=> (isset($router->uVariables['menu']) && $router->sAuthenticated === true) ? "shift" : "",
+	'menu-visible'		=> (isset($router->uVariables['menu']) && $router->sAuthenticated === true),
 	'generation'		=> "<!-- page generated in " . (round(microtime(true) - $timing_start, 6)) . " seconds. -->"
 ));
 
diff --git a/frontend/templates/default/shared/main.tpl b/frontend/templates/default/shared/main.tpl
index 2429c27..d3418ed 100644
--- a/frontend/templates/default/shared/main.tpl
+++ b/frontend/templates/default/shared/main.tpl
@@ -26,7 +26,7 @@
 					</div>
 				{%/if}
 			</div>
-			<div class="main {%?main-class}">
+			<div class="main {%if menu-visible == true}shift{%/if}">
 				{%?main}
 			</div>
 			<div class="footer">