diff --git a/public/_includes/_head-includes.jade b/public/_includes/_head-include.jade
similarity index 100%
rename from public/_includes/_head-includes.jade
rename to public/_includes/_head-include.jade
diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade
index ea56f9edd3..cef0c8b977 100644
--- a/public/_includes/_main-nav.jade
+++ b/public/_includes/_main-nav.jade
@@ -1,8 +1,9 @@
-nav
-  h1 <a href="/">Angular <sup>by Google</sup></a>
+md-toolbar(layout="row" class="main-nav" md-scroll-shrink)
+  nav.md-toolbar-tools
+    h1 <a href="/">Angular <sup>by Google</sup></a>
 
-  ul
-    li <a href="/features.html">Features</a>
-    li <a href="/docs/">Docs</a>
-    li <a href="/about/">About</a>
-    li <a href="/install/">Install</a>
+    ul
+      li <md-button href="/features.html">Features</md-button>
+      li <md-button href="/docs/">Docs</md-button>
+      li <md-button href="/about/">About</md-button>
+      li <md-button href="/install/">Install</md-button>
diff --git a/public/_layout.jade b/public/_layout.jade
index 5e7e646b53..b17a2171ad 100644
--- a/public/_layout.jade
+++ b/public/_layout.jade
@@ -1,5 +1,5 @@
 doctype
-html(lang="en" ng-app="StarterApp")
+html(lang="en"  layout="column" ng-app="StarterApp")
   head
     != partial("/_includes/_head-include")
   body(layout="column" ng-controller="AppCtrl")
diff --git a/public/docs/search.md b/public/docs/search.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss
index d6ed829bbc..43953a0e9d 100644
--- a/public/resources/css/main.scss
+++ b/public/resources/css/main.scss
@@ -1,7 +1,17 @@
+/*
+* BASE FILES
+*
+*/
+
 @import 'options';
 @import 'base';
 @import 'theme';
 
-body {
-  background: #EEE;
-}
\ No newline at end of file
+
+/*
+* MODULES
+*
+*/
+
+@import 'module/main-nav';
+@import 'module/hero';
\ No newline at end of file
diff --git a/public/resources/css/module/_hero.scss b/public/resources/css/module/_hero.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/public/resources/css/module/_main-nav.scss b/public/resources/css/module/_main-nav.scss
new file mode 100644
index 0000000000..371700e322
--- /dev/null
+++ b/public/resources/css/module/_main-nav.scss
@@ -0,0 +1,11 @@
+.main-nav {
+  ul {
+    list-style-type: none;
+    margin: 0px;
+    padding: 0px;
+
+    li {
+      margin: 0px;
+    }
+  }
+}
\ No newline at end of file
diff --git a/public/resources/js/site.js b/public/resources/js/site.js
index bddad0a487..194157d77a 100644
--- a/public/resources/js/site.js
+++ b/public/resources/js/site.js
@@ -4,5 +4,4 @@ app.controller('AppCtrl', ['$scope', '$mdSidenav', function($scope, $mdSidenav){
   $scope.toggleSidenav = function(menuId) {
     $mdSidenav(menuId).toggle();
   };
-
 }]);
\ No newline at end of file