diff --git a/TimelessTemplate.php b/TimelessTemplate.php
index e384666..75176c1 100644
--- a/TimelessTemplate.php
+++ b/TimelessTemplate.php
@@ -12,66 +12,81 @@ class TimelessTemplate extends BaseTemplate {
 		$this->html( 'headelement' );
 		?>
 		<div id="mw-wrapper">
-			<?php
-			$this->outputLogo();
-			?>
-			<div class="mw-body" role="main">
+			<div id="mw-header-container" class="ts-container">
+			<div id="mw-header" class="ts-inner">
+				<div id="user-tools">
+					<?php $this->outputUserLinks(); ?>
+				</div>
 				<?php
-				if ( $this->data['sitenotice'] ) {
-					?>
-					<div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
+				$this->outputLogo( 'p-logo-text', 'text' );
+				$this->outputSearch();
+				?>
+			</div>
+			</div>
+
+			<div id="content-container" class="ts-container">
+			<div id="content-block" class="ts-inner">
+				<div id="mw-site-navigation">
+					<h2><?php echo $this->getMsg( 'navigation-heading' )->parse() ?></h2>
 					<?php
-				}
-				if ( $this->data['newtalk'] ) {
+					$this->outputLogo( 'p-logo', 'image' );
+					echo '<div id="page-tools">';
+						$this->outputPageLinks();
+					echo '</div><div id="site-navigation">';
+						$this->outputSiteNavigation();
+					echo '</div>';
 					?>
-					<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
+				</div>
+				<div id="mw-related-navigation">
+				</div>
+				<div id="content">
+				<div class="mw-body" role="main">
 					<?php
-				}
-				?>
-
-				<h1 class="firstHeading">
-					<?php $this->html( 'title' ) ?>
-				</h1>
-				<div id="siteSub"><?php echo $this->getMsg( 'tagline' )->parse() ?></div>
-				<div class="mw-body-content">
-					<div id="contentSub">
+					if ( $this->data['sitenotice'] ) {
+						?>
+						<div id="siteNotice"><?php $this->html( 'sitenotice' ) ?></div>
 						<?php
-						if ( $this->data['subtitle'] ) {
-							?>
-							<p><?php $this->html( 'subtitle' ) ?></p>
+					}
+					if ( $this->data['newtalk'] ) {
+						?>
+						<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
+						<?php
+					}
+					?>
+
+					<h1 class="firstHeading">
+						<?php $this->html( 'title' ) ?>
+					</h1>
+					<div id="siteSub"><?php echo $this->getMsg( 'tagline' )->parse() ?></div>
+					<div class="mw-body-content">
+						<div id="contentSub">
 							<?php
-						}
-						if ( $this->data['undelete'] ) {
+							if ( $this->data['subtitle'] ) {
+								?>
+								<p><?php $this->html( 'subtitle' ) ?></p>
+								<?php
+							}
+							if ( $this->data['undelete'] ) {
+								?>
+								<p><?php $this->html( 'undelete' ) ?></p>
+								<?php
+							}
 							?>
-							<p><?php $this->html( 'undelete' ) ?></p>
-							<?php
-						}
+						</div>
+
+						<?php
+						$this->html( 'bodytext' );
+						$this->html( 'catlinks' );
+						$this->html( 'dataAfterContent' );
 						?>
 					</div>
-
-					<?php
-					$this->html( 'bodytext' );
-					$this->html( 'catlinks' );
-					$this->html( 'dataAfterContent' );
-					?>
+				</div>
 				</div>
 			</div>
-
-			<div id="mw-navigation">
-				<h2><?php echo $this->getMsg( 'navigation-heading' )->parse() ?></h2>
-				<?php
-				$this->outputSearch();
-				echo '<div id="user-tools">';
-					$this->outputUserLinks();
-				echo '</div><div id="page-tools">';
-					$this->outputPageLinks();
-				echo '</div><div id="site-navigation">';
-					$this->outputSiteNavigation();
-				echo '</div>';
-				?>
 			</div>
 
-			<div id="mw-footer">
+			<div id="mw-footer-container" class="ts-container">
+			<div id="mw-footer" class="ts-inner">
 				<?php
 				foreach ( $this->getFooterLinks() as $category => $links ) {
 					?>
@@ -104,6 +119,7 @@ class TimelessTemplate extends BaseTemplate {
 					?>
 				</ul>
 			</div>
+			</div>
 		</div>
 
 		<?php $this->printTrail() ?>
@@ -154,17 +170,21 @@ class TimelessTemplate extends BaseTemplate {
 	/**
 	 * Outputs the logo and (optionally) site title
 	 */
-	private function outputLogo( $id = 'p-logo', $imageonly = false ) {
+	private function outputLogo( $id = 'p-logo', $part = 'both' ) {
 		?>
 		<div id="<?php echo $id ?>" class="mw-portlet" role="banner">
-			<a
-				class="mw-wiki-logo"
-				href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] )
-			?>" <?php
-			echo Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
-			?>></a>
 			<?php
-			if ( !$imageonly ) {
+			if ( $part !== 'text' ) {
+				?>
+				<a
+					class="mw-wiki-logo"
+					href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] )
+				?>" <?php
+				echo Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( 'p-logo' ) )
+				?>></a>
+				<?php
+			}
+			if ( $part !== 'image' ) {
 				?>
 				<a id="p-banner" class="mw-wiki-title" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>">
 					<?php echo $this->getMsg( 'sitetitle' )->escaped() ?>
diff --git a/resources/forms.less b/resources/forms.less
index 1394497..d189133 100644
--- a/resources/forms.less
+++ b/resources/forms.less
@@ -60,7 +60,7 @@ td.mw-label {
 }
 
 fieldset {
-	border: solid @grey;
+	border: solid @grey-bright;
 	border-width: 1px 1px @border;
 	line-height: 1.3em;
 	margin: 1em 0;
@@ -127,7 +127,7 @@ textarea,
 	padding: .25em .35em;
 	border: solid 1px @grey;
 	margin: .5em 0;
-	box-shadow: inset 0px 2px 2px 1px rgba(0, 0, 0, 0.1);
+	box-shadow: inset 0px 2px 1px 1px rgba(0, 0, 0, 0.05);
 	font-size: 1em;
 	min-height: 30px;
 }
diff --git a/resources/screen-common.less b/resources/screen-common.less
index a404ccf..995e7a4 100644
--- a/resources/screen-common.less
+++ b/resources/screen-common.less
@@ -9,6 +9,8 @@ body {
 	padding: 0;
 	color: @text;
 	background: @background;
+	font-size: 1em;
+	line-height: 1.3;
 }
 
 a {
@@ -41,7 +43,7 @@ a {
 	}
 }
 
-#mw-navigation h2,
+#mw-site-navigation h2,
 #p-search h3,
 #p-personal h3 {
 	.hidden;
diff --git a/resources/screen-desktop.less b/resources/screen-desktop.less
index 61c088f..089b34c 100644
--- a/resources/screen-desktop.less
+++ b/resources/screen-desktop.less
@@ -1 +1,21 @@
 @import "variables.less";
+
+.ts-inner {
+	max-width: 1250px;
+	margin: auto;
+}
+#p-logo-text,
+#mw-site-navigation {
+	width: 12em;
+	float: left;
+}
+#p-search,
+#content {
+	margin-left: 14em;
+	margin-right: 14em;
+}
+#mw-related-navigation,
+#p-personal {
+	width: 12em;
+	float: right;
+}
diff --git a/resources/variables.less b/resources/variables.less
index 9ff7121..12ca58f 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -7,8 +7,8 @@
 @link: @blue;
 @link-red: @red;
 
-@grey: #ddd;
-@grey-bright: #f0f0f0;
+@grey: #ccc;
+@grey-bright: #eee;
 @grey-dark: #aaa;
 
 @red: #b22;
@@ -27,10 +27,15 @@
 @link-red: @red;
 
 
+/* Flair */
+
 @fonts: 'Open Sans', 'Helvetica Neue', 'Arial', sans-serif;
 @border: .2em;
 @radius: .2em;
 
+
+/* Misc */
+
 /* To hide objects, but keep them accessible for screen-readers */
 .hidden() {
 	position: absolute;