diff --git a/website/source/docs/providers/aws/index.html.markdown b/website/source/docs/providers/aws/index.html.markdown
new file mode 100644
index 000000000..52c815383
--- /dev/null
+++ b/website/source/docs/providers/aws/index.html.markdown
@@ -0,0 +1,10 @@
+---
+layout: "aws"
+page_title: "Provider: AWS"
+sidebar_current: "docs-aws-index"
+---
+
+# AWS Provider
+
+Foobar
+
diff --git a/website/source/docs/providers/index.html.markdown b/website/source/docs/providers/index.html.markdown
new file mode 100644
index 000000000..fb739259d
--- /dev/null
+++ b/website/source/docs/providers/index.html.markdown
@@ -0,0 +1,18 @@
+---
+layout: "docs"
+page_title: "Providers"
+sidebar_current: "docs-providers"
+---
+
+# Providers
+
+Terraform is used to create, manage, and manipulate infrastructure resources.
+Examples of resources include physical machines, VMs, network switches, containers,
+etc. Almost any infrastructure noun can be represented as a resource in Terraform.
+
+Terraform is agnostic to the underlying platforms by supporting providers. A provider
+is responsible for understanding API interactions and exposing resources. Providers
+generally are an IaaS (e.g. AWS, DigitalOcean, GCE), PaaS (e.g. Heroku, CloudFoundry),
+or SaaS services (e.g. DNSimple, CloudFlare).
+
+Use the navigation to the left to read about the available providers.
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
new file mode 100644
index 000000000..aee2773de
--- /dev/null
+++ b/website/source/layouts/aws.erb
@@ -0,0 +1,27 @@
+<% wrap_layout :inner do %>
+	<% content_for :sidebar do %>
+		<div class="docs-sidebar hidden-print affix-top" role="complementary">
+			<ul class="nav docs-sidenav">
+				<li<%= sidebar_current("docs-home") %>>
+				<a href="/docs/index.html">Documentation Home</a>
+                </li>
+
+				<li<%= sidebar_current("docs-aws-index") %>>
+				<a href="/docs/providers/aws/index.html">AWS Provider</a>
+                </li>
+
+				<li<%= sidebar_current("docs-aws-resource") %>>
+				<a href="/docs/providers/aws/resources.html">Resources</a>
+				<ul class="nav">
+					<li<%= sidebar_current("docs-commands-agent") %>>
+					<a href="/docs/commands/agent.html">agent</a>
+					</li>
+
+				</ul>
+				</li>
+			</ul>
+		</div>
+	<% end %>
+
+	<%= yield %>
+	<% end %>
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 8f7d96602..b0a276c2f 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -6,7 +6,7 @@
 				<a href="/docs/index.html">Documentation Home</a>
                 </li>
 
-				<li<%= sidebar_current("docs-providers") %>>
+				<li<%= sidebar_current("docs-config") %>>
 				<a href="/docs/configuration/index.html">Configuration</a>
                 <ul class="nav">
                 </ul>
@@ -52,6 +52,17 @@
 				<li<%= sidebar_current("docs-providers") %>>
 				<a href="/docs/providers/index.html">Providers</a>
                 <ul class="nav">
+					<li<%= sidebar_current("docs-providers-aws") %>>
+					<a href="/docs/providers/aws/index.html">AWS</a>
+                    </li>
+
+					<li<%= sidebar_current("docs-providers-do") %>>
+					<a href="/docs/providers/do/index.html">DigitalOcean</a>
+                    </li>
+
+					<li<%= sidebar_current("docs-providers-heroku") %>>
+					<a href="/docs/providers/heroku/index.html">Heroku</a>
+                    </li>
                 </ul>
                 </li>
 
diff --git a/website/source/stylesheets/_docs.less b/website/source/stylesheets/_docs.less
index a9b7a889f..cb3fc9e7f 100755
--- a/website/source/stylesheets/_docs.less
+++ b/website/source/stylesheets/_docs.less
@@ -6,6 +6,7 @@ body.page-sub{
 	background-color: @light-black;
 }
 
+body.layout-aws,
 body.layout-docs,
 body.layout-inner,
 body.layout-intro{
diff --git a/website/source/stylesheets/main.css b/website/source/stylesheets/main.css
index aef62cea1..51795a657 100644
--- a/website/source/stylesheets/main.css
+++ b/website/source/stylesheets/main.css
@@ -994,17 +994,20 @@ body.page-home #footer {
 body.page-sub {
   background-color: #242424;
 }
+body.layout-aws,
 body.layout-docs,
 body.layout-inner,
 body.layout-intro {
   background: #242424 url('../images/sidebar-wire.png') left 62px no-repeat;
 }
+body.layout-aws > .container .col-md-8[role=main],
 body.layout-docs > .container .col-md-8[role=main],
 body.layout-inner > .container .col-md-8[role=main],
 body.layout-intro > .container .col-md-8[role=main] {
   min-height: 800px;
   background-color: white;
 }
+body.layout-aws > .container .col-md-8[role=main] > div,
 body.layout-docs > .container .col-md-8[role=main] > div,
 body.layout-inner > .container .col-md-8[role=main] > div,
 body.layout-intro > .container .col-md-8[role=main] > div {
@@ -1155,10 +1158,12 @@ body.layout-intro > .container .col-md-8[role=main] > div {
 }
 @media (max-width: 992px) {
   body.layout-docs > .container .col-md-8[role=main],
+  body.layout-inner > .container .col-md-8[role=main],
   body.layout-intro > .container .col-md-8[role=main] {
     min-height: 0;
   }
   body.layout-docs > .container .col-md-8[role=main]::before,
+  body.layout-inner > .container .col-md-8[role=main]::before,
   body.layout-intro > .container .col-md-8[role=main]::before {
     border-left: 9999px solid white;
   }