diff --git a/css/layout.css b/css/layout.css
index 63f4aaf..83f4a2e 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -219,11 +219,13 @@ body {
 /* NAVIGATION */
 
 	/* Primary navigation */
-
+	.header .inner .unit {
+		position: relative; /* used to position the main navigation */
+	}
 	.header .primary ul {
 		position:absolute;
 		bottom:0;
-		right:17px; /* positions the main navigation */
+		right:0; /* positions the main navigation */
 	}
 	.header .primary li {
 	    float: left;
diff --git a/templates/Includes/Footer.ss b/templates/Includes/Footer.ss
index 435798c..ad948cd 100644
--- a/templates/Includes/Footer.ss
+++ b/templates/Includes/Footer.ss
@@ -1,8 +1,10 @@
 <footer class="footer" role="contentinfo">
-	<div class="inner copy">
-		<div class="left">
-			<a href="$BaseHref" class="brand" rel="home">$SiteConfig.Title</a>
-			<span class="arrow">&rarr;</span> <% include Navigation %></div>
-		<small class="right"><a href="http://simple.innovatif.com/about/">Theme</a> by <a href="http://www.saratusar.com">Sara</a> (Innovatif) / Powered by <a href="http://silverstripe.org">Silverstripe</a></small>
+	<div class="inner">
+		<div class="unit size4of4 lastUnit">
+			<div class="left">
+				<a href="$BaseHref" class="brand" rel="home">$SiteConfig.Title</a>
+				<span class="arrow">&rarr;</span> <% include Navigation %></div>
+			<small class="right"><a href="http://simple.innovatif.com/about/">Theme</a> by <a href="http://www.saratusar.com">Sara</a> (Innovatif) / Powered by <a href="http://silverstripe.org">Silverstripe</a></small>
+		</div>
 	</div>
 </footer>
\ No newline at end of file
diff --git a/templates/Includes/Header.ss b/templates/Includes/Header.ss
index ebd41c0..476843b 100644
--- a/templates/Includes/Header.ss
+++ b/templates/Includes/Header.ss
@@ -1,17 +1,19 @@
 <header class="header" role="banner">
 	<div class="inner">
-		<a href="$BaseHref" class="brand" rel="home">
-			<h1>$SiteConfig.Title</h1>
-			<% if $SiteConfig.Tagline %>
-			<p>$SiteConfig.Tagline</p>
+		<div class="unit size4of4 lastUnit">
+			<a href="$BaseHref" class="brand" rel="home">
+				<h1>$SiteConfig.Title</h1>
+				<% if $SiteConfig.Tagline %>
+				<p>$SiteConfig.Tagline</p>
+				<% end_if %>
+			</a>
+			<% if $SearchForm %>
+				<span class="search-dropdown-icon">L</span>
+				<div class="search-bar">
+					$SearchForm
+				</div>
 			<% end_if %>
-		</a>
-		<% if $SearchForm %>
-			<span class="search-dropdown-icon">L</span>
-			<div class="search-bar">
-				$SearchForm
-			</div>
-		<% end_if %>
-		<% include Navigation %>
+			<% include Navigation %>
+		</div>
 	</div>
 </header>