diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb
index cfa3f96fa..32ae55303 100644
--- a/website/source/layouts/_footer.erb
+++ b/website/source/layouts/_footer.erb
@@ -2,20 +2,12 @@
 	<div id="footer">
 	<div class="container">
 		<div class="footer-links">
-			<ul class="main-links nav navbar-nav rls-sb">
+			<ul class="footer-links nav navbar-nav rls-sb">
 				<li class="li-under"><a href="/intro/index.html">Intro</a></li>
 				<li class="active li-under"><a href="/docs/index.html">Docs</a></li>
                 <li class="li-under"><a href="/community.html">Community</a></li>
 				<li class="li-under"><a href="http://demo.terraform.io/">Demo</a></li>
 			</ul>
-
-			<ul class="buttons nav navbar-nav rls-sb">
-				<li class="first download outline-btn purple"><a href="/downloads.html">Download</a></li>
-				<li class="github outline-btn purple"><a href="https://github.com/hashicorp/terraform">Github</a></li>
-			</ul>
-		</div>
-		<div class="footer-logo">
-			<span></span>
 		</div>
 		<div class="footer-hashi os">
 			<span>&copy; 2014. A <a href="http://www.hashicorp.com">HashiCorp</a> Project.</span>
diff --git a/website/source/stylesheets/_header.less b/website/source/stylesheets/_header.less
index bb45df5e3..3dacee226 100755
--- a/website/source/stylesheets/_header.less
+++ b/website/source/stylesheets/_header.less
@@ -101,8 +101,8 @@ body.page-sub{
         li > a {
             border-bottom: 1px solid #fff;
             line-height: 26px;
-            margin: 0 15px;
-            padding: 0;
+            margin: 0 12px;
+            padding: 0 0 0 4px;
         }
 
     }
@@ -164,14 +164,12 @@ body.page-sub{
 }
 
 #footer{
-    height: 650px;
-    text-align: center;
+    padding: 140px 0 40px;
     color: @purple;
 
-    .main-links.navbar-nav{
+    .footer-links{
         float: none;
         display: inline-block;
-        padding-top: 155px;
 
         .li-under a::after {
             background-color: @purple;
@@ -179,7 +177,7 @@ body.page-sub{
     }
 
     .footer-hashi{
-        padding-top: 110px;
+        float: right;
     }
 
     a{
diff --git a/website/source/stylesheets/main.css b/website/source/stylesheets/main.css
index eb754245e..a7c5d4221 100644
--- a/website/source/stylesheets/main.css
+++ b/website/source/stylesheets/main.css
@@ -194,8 +194,8 @@ body.page-sub #header {
 #header .main-links.navbar-nav li > a {
   border-bottom: 1px solid #fff;
   line-height: 26px;
-  margin: 0 15px;
-  padding: 0;
+  margin: 0 12px;
+  padding: 0 0 0 4px;
 }
 #footer .buttons.navbar-nav,
 #header .buttons.navbar-nav {
@@ -262,20 +262,18 @@ body.page-sub #header {
             }*/
 }
 #footer {
-  height: 650px;
-  text-align: center;
+  padding: 140px 0 40px;
   color: #822ff7;
 }
-#footer .main-links.navbar-nav {
+#footer .footer-links {
   float: none;
   display: inline-block;
-  padding-top: 155px;
 }
-#footer .main-links.navbar-nav .li-under a::after {
+#footer .footer-links .li-under a::after {
   background-color: #822ff7;
 }
 #footer .footer-hashi {
-  padding-top: 110px;
+  float: right;
 }
 #footer a {
   color: #822ff7;