diff --git a/public/_includes/_hero-home.jade b/public/_includes/_hero-home.jade
index d8f9ffa70f..faf2251404 100644
--- a/public/_includes/_hero-home.jade
+++ b/public/_includes/_hero-home.jade
@@ -14,4 +14,4 @@ header(class="background-sky")
     h3.text-display-1 NG-CONF 2015
     h4.text-subhead March 5-6. Salt Lake City, Utah
 
-  a(href="http://www.ng-conf.org/" class="button button-large button-banner"  md-button) Register Today
\ No newline at end of file
+  a(href="http://www.ng-conf.org/" class="button button-large button-banner"  md-button) Watch ng-conf
\ No newline at end of file
diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade
index 20d37eb8eb..7d9dea3679 100644
--- a/public/_includes/_main-nav.jade
+++ b/public/_includes/_main-nav.jade
@@ -7,5 +7,4 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5")
       li <a class="main-nav-button" href="/docs/js/#{jsVersion}/" md-button>Docs</a>
       li <a class="main-nav-button" href="/about/" md-button>About</a>
       li <a class="main-nav-button" href="/contribute.html" md-button>Contribute</a>
-
     a(class="cta main-nav-button has-icon" href="/download.html" md-button)  <span class="icon icon-cloud-download"></span> Download
\ No newline at end of file
diff --git a/public/about/index.jade b/public/about/index.jade
index a299872177..69984ae3df 100644
--- a/public/about/index.jade
+++ b/public/about/index.jade
@@ -1 +1 @@
-h1 about
\ No newline at end of file
+h1 About
\ No newline at end of file
diff --git a/public/contribute.jade b/public/contribute.jade
index 03aabfc5e3..2fa3b2f9fc 100644
--- a/public/contribute.jade
+++ b/public/contribute.jade
@@ -1 +1 @@
-adsads
\ No newline at end of file
+h1 Contribute
\ No newline at end of file
diff --git a/public/docs/_layout.jade b/public/docs/_layout.jade
index fc7fbec6a9..ced7c0f8c9 100644
--- a/public/docs/_layout.jade
+++ b/public/docs/_layout.jade
@@ -8,7 +8,8 @@ html(lang="en"  layout="column" ng-app="myApp")
     != partial("../_includes/_docs-nav")
     != partial("../_includes/_hero")
 
-    != yield
+    article.l-content
+      != yield
 
     != partial("../_includes/_footer")
     != partial("../_includes/_scripts-include")
\ No newline at end of file
diff --git a/public/index.jade b/public/index.jade
index 3c2762a1d5..e8cb827aa2 100644
--- a/public/index.jade
+++ b/public/index.jade
@@ -1,8 +1,25 @@
-section(layout="row")
-  div(flex="70")
-    h3.text-headline  Build Incredible Web Applications
-    p.text-body Angular uses the latest technology High Life mustache bitters flannel paleo, Vice chia mumblecore tousled Williamsburg. Scenester whatever farm-to-table Kickstarter hella, lo-fi lumbersexual street art lomo swag Echo Park. High Life leggings tofu Intelligentsia bespoke, American Apparel selfies ennui.
-  div(flex="30") image goes here...
+section.grid-fluid
+  .c8.a4
+    h3.text-headline  Build Incredible Applications
+    p.text-body Angular is a development platform for creating applications using modern web standards. Angular includes a wealth of essential features such as mobile gestures, animations, filtering, routing, data binding, security, internationalization, and beautiful UI components. It's extremely modular, lightweight, and easy to learn.
+
+section.grid-fluid
+  .c8.a4
+    h3.text-headline  Start Quick, Build Fast
+    p.text-body Express your ideas with clean, understandable code. Angular is simple to build on, easy to change, and friendly to the way UX designers work. Create a UI that is beautiful by default, with material design and support for web components.
+
+section.grid-fluid
+  .c8.a4
+    h3.text-headline  Open Source &amp;  MIT Licensed
+    p.text-body Angular is built by you, for you. Our community shapes Angular's direction: core contributions come from big companies and small ones, from students and independent experts. We do our work in the open so that you can help Angular improve, or extend and modify what we've built.
+
+section.grid-fluid.text-center
+  .c8.a2.b2
+    h3.text-headline Loved by Millions of Developers
+    p.text-body But don’t take our word for it. Ramp up in minutes, and build an app today.
+
+
+
 
 
 != partial("/_includes/_cta-bar")
\ No newline at end of file
diff --git a/public/resources/css/base/_type.scss b/public/resources/css/base/_type.scss
index 6955a479c8..43f65aa36a 100644
--- a/public/resources/css/base/_type.scss
+++ b/public/resources/css/base/_type.scss
@@ -10,6 +10,10 @@ body {
   color: $platinum;
 }
 
+.text-center {
+  text-align: center;
+}
+
 .text-display-4 {
   margin: 0px 0px ($unit * 2) 0px;
   font-size: 112px;
diff --git a/public/resources/css/layout/_grids.scss b/public/resources/css/layout/_grids.scss
new file mode 100644
index 0000000000..8bf6930084
--- /dev/null
+++ b/public/resources/css/layout/_grids.scss
@@ -0,0 +1,569 @@
+/*! Copyright 2012-2014 Alex Wolfe and Rob Levin
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+/* line 24, ../scss/grids.scss */
+.grid-fluid, .grid-fixed {
+  margin: 0 auto;
+}
+/* line 9, ../scss/grids.scss */
+.grid-fluid .c1, .grid-fixed .c1, .grid-fluid .c2, .grid-fixed .c2, .grid-fluid .c3, .grid-fixed .c3, .grid-fluid .c4, .grid-fixed .c4, .grid-fluid .c5, .grid-fixed .c5, .grid-fluid .c6, .grid-fixed .c6, .grid-fluid .c7, .grid-fixed .c7, .grid-fluid .c8, .grid-fixed .c8, .grid-fluid .c9, .grid-fixed .c9, .grid-fluid .c10, .grid-fixed .c10, .grid-fluid .c11, .grid-fixed .c11, .grid-fluid .c12, .grid-fixed .c12 {
+  display: inline;
+  float: left;
+}
+/* line 12, ../scss/grids.scss */
+.grid-fluid .c1.grid-right, .grid-fixed .c1.grid-right, .grid-fluid .c2.grid-right, .grid-fixed .c2.grid-right, .grid-fluid .c3.grid-right, .grid-fixed .c3.grid-right, .grid-fluid .c4.grid-right, .grid-fixed .c4.grid-right, .grid-fluid .c5.grid-right, .grid-fixed .c5.grid-right, .grid-fluid .c6.grid-right, .grid-fixed .c6.grid-right, .grid-fluid .c7.grid-right, .grid-fixed .c7.grid-right, .grid-fluid .c8.grid-right, .grid-fixed .c8.grid-right, .grid-fluid .c9.grid-right, .grid-fixed .c9.grid-right, .grid-fluid .c10.grid-right, .grid-fixed .c10.grid-right, .grid-fluid .c11.grid-right, .grid-fixed .c11.grid-right, .grid-fluid .c12.grid-right, .grid-fixed .c12.grid-right {
+  float: right;
+}
+/* line 15, ../scss/grids.scss */
+.grid-fluid .c1.nb, .grid-fixed .c1.nb, .grid-fluid .c2.nb, .grid-fixed .c2.nb, .grid-fluid .c3.nb, .grid-fixed .c3.nb, .grid-fluid .c4.nb, .grid-fixed .c4.nb, .grid-fluid .c5.nb, .grid-fixed .c5.nb, .grid-fluid .c6.nb, .grid-fixed .c6.nb, .grid-fluid .c7.nb, .grid-fixed .c7.nb, .grid-fluid .c8.nb, .grid-fixed .c8.nb, .grid-fluid .c9.nb, .grid-fixed .c9.nb, .grid-fluid .c10.nb, .grid-fixed .c10.nb, .grid-fluid .c11.nb, .grid-fixed .c11.nb, .grid-fluid .c12.nb, .grid-fixed .c12.nb {
+  margin-left: 0;
+}
+/* line 18, ../scss/grids.scss */
+.grid-fluid .c1.na, .grid-fixed .c1.na, .grid-fluid .c2.na, .grid-fixed .c2.na, .grid-fluid .c3.na, .grid-fixed .c3.na, .grid-fluid .c4.na, .grid-fixed .c4.na, .grid-fluid .c5.na, .grid-fixed .c5.na, .grid-fluid .c6.na, .grid-fixed .c6.na, .grid-fluid .c7.na, .grid-fixed .c7.na, .grid-fluid .c8.na, .grid-fixed .c8.na, .grid-fluid .c9.na, .grid-fixed .c9.na, .grid-fluid .c10.na, .grid-fixed .c10.na, .grid-fluid .c11.na, .grid-fixed .c11.na, .grid-fluid .c12.na, .grid-fixed .c12.na {
+  margin-right: 0;
+}
+
+/* line 105, ../scss/grids.scss */
+.clear {
+  clear: both;
+}
+
+/* line 113, ../scss/grids.scss */
+.grid-fluid {
+  *zoom: 1;
+}
+/* line 92, ../scss/grids.scss */
+.grid-fluid:after, .grid-fluid:before {
+  content: '.';
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  font-size: 0;
+  line-height: 0;
+  width: 0;
+  height: 0;
+}
+/* line 61, ../scss/grids.scss */
+.grid-fluid .c1, .grid-fluid .c2, .grid-fluid .c3, .grid-fluid .c4, .grid-fluid .c5, .grid-fluid .c6, .grid-fluid .c7, .grid-fluid .c8, .grid-fluid .c9, .grid-fluid .c10, .grid-fluid .c11, .grid-fluid .c12 {
+  margin-right: 1.04167%;
+  margin-left: 1.04167%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c1 {
+  width: 6.25%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b1 {
+  margin-left: 10.41667%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a1 {
+  margin-right: 10.41667%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c2 {
+  width: 14.58333%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b2 {
+  margin-left: 18.75%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a2 {
+  margin-right: 18.75%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c3 {
+  width: 22.91667%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b3 {
+  margin-left: 27.08333%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a3 {
+  margin-right: 27.08333%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c4 {
+  width: 31.25%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b4 {
+  margin-left: 35.41667%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a4 {
+  margin-right: 35.41667%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c5 {
+  width: 39.58333%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b5 {
+  margin-left: 43.75%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a5 {
+  margin-right: 43.75%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c6 {
+  width: 47.91667%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b6 {
+  margin-left: 52.08333%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a6 {
+  margin-right: 52.08333%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c7 {
+  width: 56.25%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b7 {
+  margin-left: 60.41667%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a7 {
+  margin-right: 60.41667%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c8 {
+  width: 64.58333%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b8 {
+  margin-left: 68.75%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a8 {
+  margin-right: 68.75%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c9 {
+  width: 72.91667%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b9 {
+  margin-left: 77.08333%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a9 {
+  margin-right: 77.08333%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c10 {
+  width: 81.25%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b10 {
+  margin-left: 85.41667%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a10 {
+  margin-right: 85.41667%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c11 {
+  width: 89.58333%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b11 {
+  margin-left: 93.75%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a11 {
+  margin-right: 93.75%;
+}
+/* line 68, ../scss/grids.scss */
+.grid-fluid .c12 {
+  width: 97.91667%;
+}
+/* line 73, ../scss/grids.scss */
+.grid-fluid .b12 {
+  margin-left: 102.08333%;
+}
+/* line 79, ../scss/grids.scss */
+.grid-fluid .a12 {
+  margin-right: 102.08333%;
+}
+
+/* line 124, ../scss/grids.scss */
+.grid-fixed {
+  *zoom: 1;
+  width: 960px;
+}
+/* line 92, ../scss/grids.scss */
+.grid-fixed:after, .grid-fixed:before {
+  content: '.';
+  clear: both;
+  display: block;
+  overflow: hidden;
+  visibility: hidden;
+  font-size: 0;
+  line-height: 0;
+  width: 0;
+  height: 0;
+}
+/* line 137, ../scss/grids.scss */
+.grid-fixed .c1, .grid-fixed .c2, .grid-fixed .c3, .grid-fixed .c4, .grid-fixed .c5, .grid-fixed .c6, .grid-fixed .c7, .grid-fixed .c8, .grid-fixed .c9, .grid-fixed .c10, .grid-fixed .c11, .grid-fixed .c12 {
+  margin-right: 10px;
+  margin-left: 10px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c1 {
+  width: 60px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b1 {
+  margin-left: 90px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a1 {
+  margin-right: 90px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c2 {
+  width: 140px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b2 {
+  margin-left: 170px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a2 {
+  margin-right: 170px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c3 {
+  width: 220px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b3 {
+  margin-left: 250px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a3 {
+  margin-right: 250px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c4 {
+  width: 300px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b4 {
+  margin-left: 330px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a4 {
+  margin-right: 330px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c5 {
+  width: 380px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b5 {
+  margin-left: 410px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a5 {
+  margin-right: 410px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c6 {
+  width: 460px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b6 {
+  margin-left: 490px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a6 {
+  margin-right: 490px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c7 {
+  width: 540px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b7 {
+  margin-left: 570px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a7 {
+  margin-right: 570px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c8 {
+  width: 620px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b8 {
+  margin-left: 650px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a8 {
+  margin-right: 650px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c9 {
+  width: 700px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b9 {
+  margin-left: 730px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a9 {
+  margin-right: 730px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c10 {
+  width: 780px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b10 {
+  margin-left: 810px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a10 {
+  margin-right: 810px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c11 {
+  width: 860px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b11 {
+  margin-left: 890px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a11 {
+  margin-right: 890px;
+}
+/* line 144, ../scss/grids.scss */
+.grid-fixed .c12 {
+  width: 940px;
+}
+/* line 148, ../scss/grids.scss */
+.grid-fixed .b12 {
+  margin-left: 970px;
+}
+/* line 152, ../scss/grids.scss */
+.grid-fixed .a12 {
+  margin-right: 970px;
+}
+
+@media handheld and (max-width: 480px), screen and (max-width: 480px), screen and (max-width: 900px) {
+  /* line 6, ../scss/_responsive.scss */
+  .grid-fixed, .grid-fluid {
+    width: auto;
+  }
+}
+@media handheld and (max-width: 480px), screen and (max-width: 480px), screen and (max-width: 900px) {
+  /* line 22, ../scss/_responsive.scss */
+  .grid-fixed .c1, .grid-fixed .c2, .grid-fixed .c3, .grid-fixed .c4, .grid-fixed .c5, .grid-fixed .c6, .grid-fixed .c7, .grid-fixed .c8, .grid-fixed .c9, .grid-fixed .c10, .grid-fixed .c11, .grid-fixed .c12, .grid-fluid .c1, .grid-fluid .c2, .grid-fluid .c3, .grid-fluid .c4, .grid-fluid .c5, .grid-fluid .c6, .grid-fluid .c7, .grid-fluid .c8, .grid-fluid .c9, .grid-fluid .c10, .grid-fluid .c11, .grid-fluid .c12 {
+    margin-left: 20px;
+    margin-right: 20px;
+    float: none;
+    display: block;
+    width: auto;
+  }
+}
+@media handheld and (max-width: 900px), screen and (max-width: 900px) {
+  /* line 6, ../scss/_responsive.scss */
+  .grid-fixed, .grid-fluid {
+    margin: 0 auto;
+    *zoom: 1;
+  }
+  /* line 9, ../scss/grids.scss */
+  .grid-fixed .tablet-c1, .grid-fixed .tablet-c2, .grid-fixed .tablet-c3, .grid-fixed .tablet-c4, .grid-fixed .tablet-c5, .grid-fixed .tablet-c6, .grid-fixed .tablet-c7, .grid-fixed .tablet-c8, .grid-fixed .tablet-c9, .grid-fixed .tablet-c10, .grid-fixed .tablet-c11, .grid-fixed .tablet-c12, .grid-fluid .tablet-c1, .grid-fluid .tablet-c2, .grid-fluid .tablet-c3, .grid-fluid .tablet-c4, .grid-fluid .tablet-c5, .grid-fluid .tablet-c6, .grid-fluid .tablet-c7, .grid-fluid .tablet-c8, .grid-fluid .tablet-c9, .grid-fluid .tablet-c10, .grid-fluid .tablet-c11, .grid-fluid .tablet-c12 {
+    display: inline;
+    float: left;
+  }
+  /* line 12, ../scss/grids.scss */
+  .grid-fixed .tablet-c1.grid-right, .grid-fixed .tablet-c2.grid-right, .grid-fixed .tablet-c3.grid-right, .grid-fixed .tablet-c4.grid-right, .grid-fixed .tablet-c5.grid-right, .grid-fixed .tablet-c6.grid-right, .grid-fixed .tablet-c7.grid-right, .grid-fixed .tablet-c8.grid-right, .grid-fixed .tablet-c9.grid-right, .grid-fixed .tablet-c10.grid-right, .grid-fixed .tablet-c11.grid-right, .grid-fixed .tablet-c12.grid-right, .grid-fluid .tablet-c1.grid-right, .grid-fluid .tablet-c2.grid-right, .grid-fluid .tablet-c3.grid-right, .grid-fluid .tablet-c4.grid-right, .grid-fluid .tablet-c5.grid-right, .grid-fluid .tablet-c6.grid-right, .grid-fluid .tablet-c7.grid-right, .grid-fluid .tablet-c8.grid-right, .grid-fluid .tablet-c9.grid-right, .grid-fluid .tablet-c10.grid-right, .grid-fluid .tablet-c11.grid-right, .grid-fluid .tablet-c12.grid-right {
+    float: right;
+  }
+  /* line 15, ../scss/grids.scss */
+  .grid-fixed .tablet-c1.nb, .grid-fixed .tablet-c2.nb, .grid-fixed .tablet-c3.nb, .grid-fixed .tablet-c4.nb, .grid-fixed .tablet-c5.nb, .grid-fixed .tablet-c6.nb, .grid-fixed .tablet-c7.nb, .grid-fixed .tablet-c8.nb, .grid-fixed .tablet-c9.nb, .grid-fixed .tablet-c10.nb, .grid-fixed .tablet-c11.nb, .grid-fixed .tablet-c12.nb, .grid-fluid .tablet-c1.nb, .grid-fluid .tablet-c2.nb, .grid-fluid .tablet-c3.nb, .grid-fluid .tablet-c4.nb, .grid-fluid .tablet-c5.nb, .grid-fluid .tablet-c6.nb, .grid-fluid .tablet-c7.nb, .grid-fluid .tablet-c8.nb, .grid-fluid .tablet-c9.nb, .grid-fluid .tablet-c10.nb, .grid-fluid .tablet-c11.nb, .grid-fluid .tablet-c12.nb {
+    margin-left: 0;
+  }
+  /* line 18, ../scss/grids.scss */
+  .grid-fixed .tablet-c1.na, .grid-fixed .tablet-c2.na, .grid-fixed .tablet-c3.na, .grid-fixed .tablet-c4.na, .grid-fixed .tablet-c5.na, .grid-fixed .tablet-c6.na, .grid-fixed .tablet-c7.na, .grid-fixed .tablet-c8.na, .grid-fixed .tablet-c9.na, .grid-fixed .tablet-c10.na, .grid-fixed .tablet-c11.na, .grid-fixed .tablet-c12.na, .grid-fluid .tablet-c1.na, .grid-fluid .tablet-c2.na, .grid-fluid .tablet-c3.na, .grid-fluid .tablet-c4.na, .grid-fluid .tablet-c5.na, .grid-fluid .tablet-c6.na, .grid-fluid .tablet-c7.na, .grid-fluid .tablet-c8.na, .grid-fluid .tablet-c9.na, .grid-fluid .tablet-c10.na, .grid-fluid .tablet-c11.na, .grid-fluid .tablet-c12.na {
+    margin-right: 0;
+  }
+  /* line 92, ../scss/grids.scss */
+  .grid-fixed:after, .grid-fixed:before, .grid-fluid:after, .grid-fluid:before {
+    content: '.';
+    clear: both;
+    display: block;
+    overflow: hidden;
+    visibility: hidden;
+    font-size: 0;
+    line-height: 0;
+    width: 0;
+    height: 0;
+  }
+  /* line 61, ../scss/grids.scss */
+  .grid-fixed .tablet-c1, .grid-fixed .tablet-c2, .grid-fixed .tablet-c3, .grid-fixed .tablet-c4, .grid-fixed .tablet-c5, .grid-fixed .tablet-c6, .grid-fixed .tablet-c7, .grid-fixed .tablet-c8, .grid-fixed .tablet-c9, .grid-fixed .tablet-c10, .grid-fixed .tablet-c11, .grid-fixed .tablet-c12, .grid-fluid .tablet-c1, .grid-fluid .tablet-c2, .grid-fluid .tablet-c3, .grid-fluid .tablet-c4, .grid-fluid .tablet-c5, .grid-fluid .tablet-c6, .grid-fluid .tablet-c7, .grid-fluid .tablet-c8, .grid-fluid .tablet-c9, .grid-fluid .tablet-c10, .grid-fluid .tablet-c11, .grid-fluid .tablet-c12 {
+    margin-right: 1.04167%;
+    margin-left: 1.04167%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c1, .grid-fluid .tablet-c1 {
+    width: 6.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c2, .grid-fluid .tablet-c2 {
+    width: 14.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c3, .grid-fluid .tablet-c3 {
+    width: 22.91667%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c4, .grid-fluid .tablet-c4 {
+    width: 31.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c5, .grid-fluid .tablet-c5 {
+    width: 39.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c6, .grid-fluid .tablet-c6 {
+    width: 47.91667%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c7, .grid-fluid .tablet-c7 {
+    width: 56.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c8, .grid-fluid .tablet-c8 {
+    width: 64.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c9, .grid-fluid .tablet-c9 {
+    width: 72.91667%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c10, .grid-fluid .tablet-c10 {
+    width: 81.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c11, .grid-fluid .tablet-c11 {
+    width: 89.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .tablet-c12, .grid-fluid .tablet-c12 {
+    width: 97.91667%;
+  }
+}
+@media handheld and (max-width: 480px), screen and (max-width: 480px) {
+  /* line 6, ../scss/_responsive.scss */
+  .grid-fixed, .grid-fluid {
+    margin: 0 auto;
+    *zoom: 1;
+  }
+  /* line 9, ../scss/grids.scss */
+  .grid-fixed .phone-c1, .grid-fixed .phone-c2, .grid-fixed .phone-c3, .grid-fixed .phone-c4, .grid-fixed .phone-c5, .grid-fixed .phone-c6, .grid-fixed .phone-c7, .grid-fixed .phone-c8, .grid-fixed .phone-c9, .grid-fixed .phone-c10, .grid-fixed .phone-c11, .grid-fixed .phone-c12, .grid-fluid .phone-c1, .grid-fluid .phone-c2, .grid-fluid .phone-c3, .grid-fluid .phone-c4, .grid-fluid .phone-c5, .grid-fluid .phone-c6, .grid-fluid .phone-c7, .grid-fluid .phone-c8, .grid-fluid .phone-c9, .grid-fluid .phone-c10, .grid-fluid .phone-c11, .grid-fluid .phone-c12 {
+    display: inline;
+    float: left;
+  }
+  /* line 12, ../scss/grids.scss */
+  .grid-fixed .phone-c1.grid-right, .grid-fixed .phone-c2.grid-right, .grid-fixed .phone-c3.grid-right, .grid-fixed .phone-c4.grid-right, .grid-fixed .phone-c5.grid-right, .grid-fixed .phone-c6.grid-right, .grid-fixed .phone-c7.grid-right, .grid-fixed .phone-c8.grid-right, .grid-fixed .phone-c9.grid-right, .grid-fixed .phone-c10.grid-right, .grid-fixed .phone-c11.grid-right, .grid-fixed .phone-c12.grid-right, .grid-fluid .phone-c1.grid-right, .grid-fluid .phone-c2.grid-right, .grid-fluid .phone-c3.grid-right, .grid-fluid .phone-c4.grid-right, .grid-fluid .phone-c5.grid-right, .grid-fluid .phone-c6.grid-right, .grid-fluid .phone-c7.grid-right, .grid-fluid .phone-c8.grid-right, .grid-fluid .phone-c9.grid-right, .grid-fluid .phone-c10.grid-right, .grid-fluid .phone-c11.grid-right, .grid-fluid .phone-c12.grid-right {
+    float: right;
+  }
+  /* line 15, ../scss/grids.scss */
+  .grid-fixed .phone-c1.nb, .grid-fixed .phone-c2.nb, .grid-fixed .phone-c3.nb, .grid-fixed .phone-c4.nb, .grid-fixed .phone-c5.nb, .grid-fixed .phone-c6.nb, .grid-fixed .phone-c7.nb, .grid-fixed .phone-c8.nb, .grid-fixed .phone-c9.nb, .grid-fixed .phone-c10.nb, .grid-fixed .phone-c11.nb, .grid-fixed .phone-c12.nb, .grid-fluid .phone-c1.nb, .grid-fluid .phone-c2.nb, .grid-fluid .phone-c3.nb, .grid-fluid .phone-c4.nb, .grid-fluid .phone-c5.nb, .grid-fluid .phone-c6.nb, .grid-fluid .phone-c7.nb, .grid-fluid .phone-c8.nb, .grid-fluid .phone-c9.nb, .grid-fluid .phone-c10.nb, .grid-fluid .phone-c11.nb, .grid-fluid .phone-c12.nb {
+    margin-left: 0;
+  }
+  /* line 18, ../scss/grids.scss */
+  .grid-fixed .phone-c1.na, .grid-fixed .phone-c2.na, .grid-fixed .phone-c3.na, .grid-fixed .phone-c4.na, .grid-fixed .phone-c5.na, .grid-fixed .phone-c6.na, .grid-fixed .phone-c7.na, .grid-fixed .phone-c8.na, .grid-fixed .phone-c9.na, .grid-fixed .phone-c10.na, .grid-fixed .phone-c11.na, .grid-fixed .phone-c12.na, .grid-fluid .phone-c1.na, .grid-fluid .phone-c2.na, .grid-fluid .phone-c3.na, .grid-fluid .phone-c4.na, .grid-fluid .phone-c5.na, .grid-fluid .phone-c6.na, .grid-fluid .phone-c7.na, .grid-fluid .phone-c8.na, .grid-fluid .phone-c9.na, .grid-fluid .phone-c10.na, .grid-fluid .phone-c11.na, .grid-fluid .phone-c12.na {
+    margin-right: 0;
+  }
+  /* line 92, ../scss/grids.scss */
+  .grid-fixed:after, .grid-fixed:before, .grid-fluid:after, .grid-fluid:before {
+    content: '.';
+    clear: both;
+    display: block;
+    overflow: hidden;
+    visibility: hidden;
+    font-size: 0;
+    line-height: 0;
+    width: 0;
+    height: 0;
+  }
+  /* line 61, ../scss/grids.scss */
+  .grid-fixed .phone-c1, .grid-fixed .phone-c2, .grid-fixed .phone-c3, .grid-fixed .phone-c4, .grid-fixed .phone-c5, .grid-fixed .phone-c6, .grid-fixed .phone-c7, .grid-fixed .phone-c8, .grid-fixed .phone-c9, .grid-fixed .phone-c10, .grid-fixed .phone-c11, .grid-fixed .phone-c12, .grid-fluid .phone-c1, .grid-fluid .phone-c2, .grid-fluid .phone-c3, .grid-fluid .phone-c4, .grid-fluid .phone-c5, .grid-fluid .phone-c6, .grid-fluid .phone-c7, .grid-fluid .phone-c8, .grid-fluid .phone-c9, .grid-fluid .phone-c10, .grid-fluid .phone-c11, .grid-fluid .phone-c12 {
+    margin-right: 1.04167%;
+    margin-left: 1.04167%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c1, .grid-fluid .phone-c1 {
+    width: 6.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c2, .grid-fluid .phone-c2 {
+    width: 14.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c3, .grid-fluid .phone-c3 {
+    width: 22.91667%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c4, .grid-fluid .phone-c4 {
+    width: 31.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c5, .grid-fluid .phone-c5 {
+    width: 39.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c6, .grid-fluid .phone-c6 {
+    width: 47.91667%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c7, .grid-fluid .phone-c7 {
+    width: 56.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c8, .grid-fluid .phone-c8 {
+    width: 64.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c9, .grid-fluid .phone-c9 {
+    width: 72.91667%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c10, .grid-fluid .phone-c10 {
+    width: 81.25%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c11, .grid-fluid .phone-c11 {
+    width: 89.58333%;
+  }
+  /* line 68, ../scss/grids.scss */
+  .grid-fixed .phone-c12, .grid-fluid .phone-c12 {
+    width: 97.91667%;
+  }
+}
\ No newline at end of file
diff --git a/public/resources/css/_layout.scss b/public/resources/css/layout/_layout.scss
similarity index 98%
rename from public/resources/css/_layout.scss
rename to public/resources/css/layout/_layout.scss
index 5ad5e5e608..9cf0729446 100644
--- a/public/resources/css/_layout.scss
+++ b/public/resources/css/layout/_layout.scss
@@ -1,3 +1,5 @@
+@import 'grids';
+
 .l-left {
   float: left;
 }
diff --git a/public/resources/css/main.scss b/public/resources/css/main.scss
index a2ebbdc959..1918983c1e 100644
--- a/public/resources/css/main.scss
+++ b/public/resources/css/main.scss
@@ -5,7 +5,7 @@
 
 @import 'options';
 @import 'state';
-@import 'layout';
+@import 'layout/layout';
 @import 'theme';
 @import 'base/reset';
 @import 'base/type';