diff --git a/docs/README.md b/docs/README.md
index 1a28282eb..4fb5ccff6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -13,332 +13,56 @@ menuItems:
 ### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/)
 <!-- DOCS-SITE-LINK:END -->
 
-# Documentation
+The Serverless Framework is a CLI tool that allows users to build & deploy auto-scaling, pay-per-execution, event-driven functions.
 
-The Serverless Framework allows you to deploy auto-scaling, pay-per-execution, event-driven functions to any cloud. We currently support AWS Lambda, Apache OpenWhisk, Microsoft Azure, Google Cloud Functions and are expanding to support other cloud providers.
+Write your code as functions, configure events to trigger your functions, then deploy & run those functions to your [cloud provider](#Supported-Providers) via the **serverless CLI**
+
+## Serverless Cloud Providers
 
 <div class="docsSections">
   <div class="docsSection">
     <div class="docsSectionHeader">
-      <a href="./providers/aws/guide/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_guide.png" alt="Serverless Framework AWS Lambda Guide" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div class="test">
-      <ul>
-        <li><a href="./providers/aws/guide/intro.md">Intro</a></li>
-        <li><a href="./providers/aws/guide/installation.md">Installation</a></li>
-        <li><a href="./providers/aws/guide/credentials.md">Credentials</a></li>
-        <li><a href="./providers/aws/guide/services.md">Services</a></li>
-        <li><a href="./providers/aws/guide/functions.md">Functions</a></li>
-        <li><a href="./providers/aws/guide/events.md">Events</a></li>
-        <li><a href="./providers/aws/guide/resources.md">Resources</a></li>
-        <li><a href="./providers/aws/guide/deploying.md">Deploying</a></li>
-        <li><a href="./providers/aws/guide/testing.md">Testing</a></li>
-        <li><a href="./providers/aws/guide/variables.md">Variables</a></li>
-        <li><a href="./providers/aws/guide/packaging.md">Packaging</a></li>
-        <li><a href="./providers/aws/guide/iam.md">IAM</a></li>
-        <li><a href="./providers/aws/guide/plugins.md">Plugins</a></li>
-        <li><a href="./providers/aws/guide/workflow.md">Workflow</a></li>
-        <li><a href="./providers/aws/guide/serverless.yml.md">Serverless.yml</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/aws/cli-reference/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_cli.png" alt="Serverless Framework AWS Lambda CLI Reference" width="250" draggable="false"/>
+      <a href="./providers/aws/">
+        <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_guide.png" width="250" draggable="false"/>
       </a>
     </div>
     <div>
       <ul>
-        <li><a href="./providers/aws/cli-reference/config-credentials.md">Config Credentials</a></li>
-        <li><a href="./providers/aws/cli-reference/create.md">Create</a></li>
-        <li><a href="./providers/aws/cli-reference/install.md">Install</a></li>
-        <li><a href="./providers/aws/cli-reference/package.md">Package</a></li>
-        <li><a href="./providers/aws/cli-reference/deploy.md">Deploy</a></li>
-        <li><a href="./providers/aws/cli-reference/deploy-function.md">Deploy Function</a></li>
-        <li><a href="./providers/aws/cli-reference/deploy-list.md">Deploy List</a></li>
-        <li><a href="./providers/aws/cli-reference/invoke.md">Invoke</a></li>
-        <li><a href="./providers/aws/cli-reference/invoke-local.md">Invoke Local</a></li>
-        <li><a href="./providers/aws/cli-reference/logs.md">Logs</a></li>
-        <li><a href="./providers/aws/cli-reference/metrics.md">Metrics</a></li>
-        <li><a href="./providers/aws/cli-reference/info.md">Info</a></li>
-        <li><a href="./providers/aws/cli-reference/rollback.md">Rollback</a></li>
-        <li><a href="./providers/aws/cli-reference/remove.md">Remove</a></li>
-        <li><a href="./providers/aws/cli-reference/slstats.md">Serverless Stats</a></li>
+        <li><a href="./providers/aws/guide">Guide</a></li>
+        <li><a href="./providers/aws/cli-reference">CLI Reference</a></li>
+        <li><a href="./providers/aws/events">Events</a></li>
+        <li><a href="./providers/aws/examples">Examples</a></li>
       </ul>
     </div>
   </div>
-
   <div class="docsSection">
     <div class="docsSectionHeader">
-      <a href="./providers/aws/events/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_events.png" alt="Serverless Framework AWS Lambda Events"  width="250" draggable="false"/>
+      <a href="./providers/azure/">
+        <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_guide.png" width="250" draggable="false"/>
       </a>
     </div>
     <div>
       <ul>
-        <li><a href="./providers/aws/events/apigateway.md">API Gateway</a></li>
-        <li><a href="./providers/aws/events/streams.md">Streams</a></li>
-        <li><a href="./providers/aws/events/s3.md">S3</a></li>
-        <li><a href="./providers/aws/events/schedule.md">Schedule</a></li>
-        <li><a href="./providers/aws/events/sns.md">SNS</a></li>
-        <li><a href="./providers/aws/events/alexa-skill.md">Alexa Skill</a></li>
-        <li><a href="./providers/aws/events/iot.md">IoT</a></li>
-        <li><a href="./providers/aws/events/cloudwatch-event.md">CloudWatch Event</a></li>
-        <li><a href="./providers/aws/events/cloudwatch-log.md">CloudWatch Log</a></li>
+        <li><a href="./providers/azure/guide">Guide</a></li>
+        <li><a href="./providers/azure/cli-reference">CLI Reference</a></li>
+        <li><a href="./providers/azure/events">Events</a></li>
+        <li><a href="./providers/azure/examples">Examples</a></li>
       </ul>
     </div>
   </div>
-
   <div class="docsSection">
     <div class="docsSectionHeader">
-      <a href="./providers/aws/examples/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_examples.png" alt="Serverless Framework AWS Lambda Examples" width="250" draggable="false"/>
+      <a href="./providers/openwhisk/">
+        <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_guide.png" width="250" draggable="false"/>
       </a>
     </div>
     <div>
-      <div>
-        <ul>
-          <li><a href="./providers/aws/examples/hello-world">Hello World</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="docsSections">
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/openwhisk/guide/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_guide_openwhisk.jpg" alt="Serverless Framework Apache OpenWhisk Guide" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div class="test">
-      <ul>
-        <li><a href="./providers/openwhisk/guide/intro.md">Intro</a></li>
-        <li><a href="./providers/openwhisk/guide/installation.md">Installation</a></li>
-        <li><a href="./providers/openwhisk/guide/credentials.md">Credentials</a></li>
-        <li><a href="./providers/openwhisk/guide/services.md">Services</a></li>
-        <li><a href="./providers/openwhisk/guide/functions.md">Functions</a></li>
-        <li><a href="./providers/openwhisk/guide/events.md">Events</a></li>
-        <li><a href="./providers/openwhisk/guide/deploying.md">Deploying</a></li>
-        <li><a href="./providers/openwhisk/guide/testing.md">Testing</a></li>
-        <li><a href="./providers/openwhisk/guide/variables.md">Variables</a></li>
-        <li><a href="./providers/openwhisk/guide/packaging.md">Packaging</a></li>
-        <li><a href="./providers/openwhisk/guide/plugins.md">Plugins</a></li>
-        <li><a href="./providers/openwhisk/guide/web-actions.md">Web Actions</a></li>
-        <li><a href="./providers/openwhisk/guide/workflow.md">Workflow</a></li>
-        <li><a href="./providers/openwhisk/guide/serverless.yml.md">Serverless.yml</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/openwhisk/cli-reference/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_cli_openwhisk.jpg" alt="Serverless Framework Apache OpenWhisk CLI Reference" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <ul>
-        <li><a href="./providers/openwhisk/cli-reference/config-credentials.md">Config Credentials</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/create.md">Create</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/install.md">Install</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/deploy.md">Deploy</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/deploy-function.md">Deploy Function</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/invoke.md">Invoke</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/invoke-local.md">Invoke Local</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/logs.md">Logs</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/info.md">Info</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/remove.md">Remove</a></li>
-        <li><a href="./providers/openwhisk/cli-reference/slstats.md">Serverless Stats</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/openwhisk/events/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_events_openwhisk.jpg" alt="Serverless Framework Apache OpenWhisk Events"  width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <ul>
-        <li><a href="./providers/openwhisk/events/apigateway.md">API Gateway</a></li>
-        <li><a href="./providers/openwhisk/events/cloudant.md">Cloudant DB</a></li>
-        <li><a href="./providers/openwhisk/events/messagehub.md">Message Hub</a></li>
-        <li><a href="./providers/openwhisk/events/schedule.md">Schedule</a></li>
-        <li><a href="./providers/openwhisk/events/triggers.md">Triggers</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/openwhisk/examples/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_examples_openwhisk.jpg" alt="Serverless Framework Apache OpenWhisk Examples" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <div>
-        <ul>
-          <li><a href="./providers/openwhisk/examples/hello-world">Hello World</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="docsSections">
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/azure/guide/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_guide_azure.jpg" alt="Serverless Framework Microsoft Azure Guide" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div class="test">
-      <ul>
-        <li><a href="./providers/azure/guide/intro.md">Intro</a></li>
-        <li><a href="./providers/azure/guide/quickstart.md">Quickstart</a></li>
-        <li><a href="./providers/azure/guide/installation.md">Installation</a></li>
-        <li><a href="./providers/azure/guide/credentials.md">Credentials</a></li>
-        <li><a href="./providers/azure/guide/services.md">Services</a></li>
-        <li><a href="./providers/azure/guide/functions.md">Functions</a></li>
-        <li><a href="./providers/azure/guide/events.md">Events</a></li>
-        <li><a href="./providers/azure/guide/deploying.md">Deploying</a></li>
-        <li><a href="./providers/azure/guide/testing.md">Testing</a></li>
-        <li><a href="./providers/azure/guide/variables.md">Variables</a></li>
-        <li><a href="./providers/azure/guide/packaging.md">Packaging</a></li>
-        <li><a href="./providers/azure/guide/plugins.md">Plugins</a></li>
-        <li><a href="./providers/azure/guide/workflow.md">Workflow</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/azure/cli-reference/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_cli_azure.jpg" alt="Serverless Framework Microsoft Azure CLI Reference" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <ul>
-        <li><a href="./providers/azure/cli-reference/install.md">Install</a></li>
-        <li><a href="./providers/azure/cli-reference/deploy.md">Deploy</a></li>
-        <li><a href="./providers/azure/cli-reference/deploy-function.md">Deploy Function</a></li>
-        <li><a href="./providers/azure/cli-reference/invoke.md">Invoke</a></li>
-        <li><a href="./providers/azure/cli-reference/logs.md">Logs</a></li>
-        <li><a href="./providers/azure/cli-reference/remove.md">Remove</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/azure/events/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_events_azure.jpg" alt="Serverless Framework Microsoft Azure Events"  width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <ul>
-        <li><a href="./providers/azure/events/http.md">HTTP</a></li>
-        <li><a href="./providers/azure/events/timer.md">Timer</a></li>
-        <li><a href="./providers/azure/events/queuestorage.md">Queue Storage</a></li>
-        <li><a href="./providers/azure/events/servicebus.md">Service Bus</a></li>
-        <li><a href="./providers/azure/events/eventhubs.md">Event Hubs</a></li>
-        <li><a href="./providers/azure/events/blobstorage.md">Blob Storage</a></li>
-        <li><a href="./providers/azure/events/other.md">Other Bindings</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/azure/examples/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_examples_azure.jpg" alt="Serverless Framework Microsoft Azure Examples" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <div>
-        <ul>
-          <li><a href="./providers/azure/examples/hello-world">Hello World</a></li>
-        </ul>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="docsSections">
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/google/guide/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_guide_google.jpg" alt="Serverless Framework Google Cloud Functions Guide" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div class="test">
-      <ul>
-        <li><a href="./providers/google/guide/intro.md">Intro</a></li>
-        <li><a href="./providers/google/guide/quickstart.md">Quickstart</a></li>
-        <li><a href="./providers/google/guide/installation.md">Installation</a></li>
-        <li><a href="./providers/google/guide/credentials.md">Credentials</a></li>
-        <li><a href="./providers/google/guide/services.md">Services</a></li>
-        <li><a href="./providers/google/guide/functions.md">Functions</a></li>
-        <li><a href="./providers/google/guide/events.md">Events</a></li>
-        <li><a href="./providers/google/guide/deploying.md">Deploying</a></li>
-        <li><a href="./providers/google/guide/variables.md">Variables</a></li>
-        <li><a href="./providers/google/guide/plugins.md">Plugins</a></li>
-        <li><a href="./providers/google/guide/workflow.md">Workflow</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/google/cli-reference/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_cli_google.jpg" alt="Serverless Framework Google Cloud Functions CLI Reference" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <ul>
-        <li><a href="./providers/google/cli-reference/install.md">Install</a></li>
-        <li><a href="./providers/google/cli-reference/deploy.md">Deploy</a></li>
-        <li><a href="./providers/google/cli-reference/info.md">Info</a></li>
-        <li><a href="./providers/google/cli-reference/invoke.md">Invoke</a></li>
-        <li><a href="./providers/google/cli-reference/logs.md">Logs</a></li>
-        <li><a href="./providers/google/cli-reference/remove.md">Remove</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/google/events/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_events_google.jpg" alt="Serverless Framework Google Cloud Functions EventsEvents"  width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <ul>
-        <li><a href="./providers/google/events/http.md">HTTP</a></li>
-        <li><a href="./providers/google/events/event.md">Event</a></li>
-      </ul>
-    </div>
-  </div>
-
-  <div class="docsSection">
-    <div class="docsSectionHeader">
-      <a href="./providers/google/examples/">
-      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_examples_google.jpg" alt="Serverless Framework Microsoft Google Cloud Functions Examples" width="250" draggable="false"/>
-      </a>
-    </div>
-    <div>
-      <div>
-        <ul>
-          <li><a href="./providers/google/examples/hello-world">Hello World</a></li>
-        </ul>
-      </div>
+      <ul>
+        <li><a href="./providers/openwhisk/guide">Guide</a></li>
+        <li><a href="./providers/openwhisk/cli-reference">CLI Reference</a></li>
+        <li><a href="./providers/openwhisk/events">Events</a></li>
+        <li><a href="./providers/openwhisk/examples">Examples</a></li>
+      </ul>
     </div>
   </div>
 </div>
diff --git a/docs/providers/aws/README.md b/docs/providers/aws/README.md
index 7a6629265..e8fa87633 100644
--- a/docs/providers/aws/README.md
+++ b/docs/providers/aws/README.md
@@ -8,12 +8,102 @@ layout: Doc
 ### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/)
 <!-- DOCS-SITE-LINK:END -->
 
-# Serverless AWS Provider Documentation
+# AWS Provider Documentation
 
-Welcome to the Serverless Amazon Web Services documentation!
-
-Please select a section on the left to get started.
+Welcome to the Serverless Azure Functions documentation!
 
 If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless)
 
-**Note:** Before continuing [AWS system credentials](./guide/credentials.md) are required for using the CLI.
+**Note:** [AWS system credentials](./guide/credentials.md) are required for using serverless + AWS.
+
+<div class="docsSections">
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/aws/guide/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_guide.png" alt="Serverless Framework AWS Lambda Guide" width="250" draggable="false"/>
+      </a>
+    </div>
+    <div class="test">
+      <ul>
+        <li><a href="./providers/aws/guide/intro.md">Intro</a></li>
+        <li><a href="./providers/aws/guide/installation.md">Installation</a></li>
+        <li><a href="./providers/aws/guide/credentials.md">Credentials</a></li>
+        <li><a href="./providers/aws/guide/services.md">Services</a></li>
+        <li><a href="./providers/aws/guide/functions.md">Functions</a></li>
+        <li><a href="./providers/aws/guide/events.md">Events</a></li>
+        <li><a href="./providers/aws/guide/resources.md">Resources</a></li>
+        <li><a href="./providers/aws/guide/deploying.md">Deploying</a></li>
+        <li><a href="./providers/aws/guide/testing.md">Testing</a></li>
+        <li><a href="./providers/aws/guide/variables.md">Variables</a></li>
+        <li><a href="./providers/aws/guide/packaging.md">Packaging</a></li>
+        <li><a href="./providers/aws/guide/iam.md">IAM</a></li>
+        <li><a href="./providers/aws/guide/plugins.md">Plugins</a></li>
+        <li><a href="./providers/aws/guide/workflow.md">Workflow</a></li>
+        <li><a href="./providers/aws/guide/serverless.yml.md">Serverless.yml</a></li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/aws/cli-reference/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_cli.png" alt="Serverless Framework AWS Lambda CLI Reference" width="250" draggable="false"/>
+      </a>
+    </div>
+    <div>
+      <ul>
+        <li><a href="./providers/aws/cli-reference/config-credentials.md">Config Credentials</a></li>
+        <li><a href="./providers/aws/cli-reference/create.md">Create</a></li>
+        <li><a href="./providers/aws/cli-reference/install.md">Install</a></li>
+        <li><a href="./providers/aws/cli-reference/package.md">Package</a></li>
+        <li><a href="./providers/aws/cli-reference/deploy.md">Deploy</a></li>
+        <li><a href="./providers/aws/cli-reference/deploy-function.md">Deploy Function</a></li>
+        <li><a href="./providers/aws/cli-reference/deploy-list.md">Deploy List</a></li>
+        <li><a href="./providers/aws/cli-reference/invoke.md">Invoke</a></li>
+        <li><a href="./providers/aws/cli-reference/invoke-local.md">Invoke Local</a></li>
+        <li><a href="./providers/aws/cli-reference/logs.md">Logs</a></li>
+        <li><a href="./providers/aws/cli-reference/metrics.md">Metrics</a></li>
+        <li><a href="./providers/aws/cli-reference/info.md">Info</a></li>
+        <li><a href="./providers/aws/cli-reference/rollback.md">Rollback</a></li>
+        <li><a href="./providers/aws/cli-reference/remove.md">Remove</a></li>
+        <li><a href="./providers/aws/cli-reference/slstats.md">Serverless Stats</a></li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/aws/events/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_events.png" alt="Serverless Framework AWS Lambda Events"  width="250" draggable="false"/>
+      </a>
+    </div>
+    <div>
+      <ul>
+        <li><a href="./providers/aws/events/apigateway.md">API Gateway</a></li>
+        <li><a href="./providers/aws/events/streams.md">Streams</a></li>
+        <li><a href="./providers/aws/events/s3.md">S3</a></li>
+        <li><a href="./providers/aws/events/schedule.md">Schedule</a></li>
+        <li><a href="./providers/aws/events/sns.md">SNS</a></li>
+        <li><a href="./providers/aws/events/alexa-skill.md">Alexa Skill</a></li>
+        <li><a href="./providers/aws/events/iot.md">IoT</a></li>
+        <li><a href="./providers/aws/events/cloudwatch-event.md">CloudWatch Event</a></li>
+        <li><a href="./providers/aws/events/cloudwatch-log.md">CloudWatch Log</a></li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/aws/examples/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/sls_aws_examples.png" alt="Serverless Framework AWS Lambda Examples" width="250" draggable="false"/>
+      </a>
+    </div>
+    <div>
+      <div>
+        <ul>
+          <li><a href="./providers/aws/examples/hello-world">Hello World</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/docs/providers/azure/README.md b/docs/providers/azure/README.md
index 855a81cd6..48ce7023c 100644
--- a/docs/providers/azure/README.md
+++ b/docs/providers/azure/README.md
@@ -8,12 +8,89 @@ layout: Doc
 ### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/azure/)
 <!-- DOCS-SITE-LINK:END -->
 
-# Serverless Azure Functions Provider Documentation
+# Azure Functions Provider Documentation
 
 Welcome to the Serverless Azure Functions documentation!
 
-Please select a section on the left to get started.
-
 If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless)
 
-**Note:** Before continuing [Azure Functions system credentials](./guide/credentials.md) are required for using the CLI.
+**Note:** [Azure Functions system credentials](./guide/credentials.md) are required for using serverless + Azure Functions.
+
+<div class="docsSections">
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/azure/guide/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_guide_azure.jpg" alt="Serverless Framework Microsoft Azure Guide" width="250" draggable="false"/>
+      </a>
+    </div>
+    <div class="test">
+      <ul>
+        <li><a href="./providers/azure/guide/intro.md">Intro</a></li>
+        <li><a href="./providers/azure/guide/quickstart.md">Quickstart</a></li>
+        <li><a href="./providers/azure/guide/installation.md">Installation</a></li>
+        <li><a href="./providers/azure/guide/credentials.md">Credentials</a></li>
+        <li><a href="./providers/azure/guide/services.md">Services</a></li>
+        <li><a href="./providers/azure/guide/functions.md">Functions</a></li>
+        <li><a href="./providers/azure/guide/events.md">Events</a></li>
+        <li><a href="./providers/azure/guide/deploying.md">Deploying</a></li>
+        <li><a href="./providers/azure/guide/testing.md">Testing</a></li>
+        <li><a href="./providers/azure/guide/variables.md">Variables</a></li>
+        <li><a href="./providers/azure/guide/packaging.md">Packaging</a></li>
+        <li><a href="./providers/azure/guide/plugins.md">Plugins</a></li>
+        <li><a href="./providers/azure/guide/workflow.md">Workflow</a></li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/azure/cli-reference/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_cli_azure.jpg" alt="Serverless Framework Microsoft Azure CLI Reference" width="250" draggable="false"/>
+      </a>
+    </div>
+    <div>
+      <ul>
+        <li><a href="./providers/azure/cli-reference/install.md">Install</a></li>
+        <li><a href="./providers/azure/cli-reference/deploy.md">Deploy</a></li>
+        <li><a href="./providers/azure/cli-reference/deploy-function.md">Deploy Function</a></li>
+        <li><a href="./providers/azure/cli-reference/invoke.md">Invoke</a></li>
+        <li><a href="./providers/azure/cli-reference/logs.md">Logs</a></li>
+        <li><a href="./providers/azure/cli-reference/remove.md">Remove</a></li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/azure/events/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_events_azure.jpg" alt="Serverless Framework Microsoft Azure Events"  width="250" draggable="false"/>
+      </a>
+    </div>
+    <div>
+      <ul>
+        <li><a href="./providers/azure/events/http.md">HTTP</a></li>
+        <li><a href="./providers/azure/events/timer.md">Timer</a></li>
+        <li><a href="./providers/azure/events/queuestorage.md">Queue Storage</a></li>
+        <li><a href="./providers/azure/events/servicebus.md">Service Bus</a></li>
+        <li><a href="./providers/azure/events/eventhubs.md">Event Hubs</a></li>
+        <li><a href="./providers/azure/events/blobstorage.md">Blob Storage</a></li>
+        <li><a href="./providers/azure/events/other.md">Other Bindings</a></li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="docsSection">
+    <div class="docsSectionHeader">
+      <a href="./providers/azure/examples/">
+      <img src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/images/docs_examples_azure.jpg" alt="Serverless Framework Microsoft Azure Examples" width="250" draggable="false"/>
+      </a>
+    </div>
+    <div>
+      <div>
+        <ul>
+          <li><a href="./providers/azure/examples/hello-world">Hello World</a></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/docs/providers/openwhisk/README.md b/docs/providers/openwhisk/README.md
index 0711c0616..c5e72307d 100644
--- a/docs/providers/openwhisk/README.md
+++ b/docs/providers/openwhisk/README.md
@@ -8,16 +8,13 @@ layout: Doc
 ### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/openwhisk/)
 <!-- DOCS-SITE-LINK:END -->
 
-# Serverless Apache OpenWhisk Provider Documentation
+# Apache OpenWhisk Provider Documentation
 
 Welcome to the Serverless Apache OpenWhisk documentation!
 
-Please select a section on the left to get started.
-
 If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://gitter.im/serverless/serverless)
 
-**Note:** Before continuing [Apache OpenWhisk system credentials](./guide/credentials.md) are required for using the CLI.
-
+**Note:** [Apache OpenWhisk system credentials](./guide/credentials.md) are required for using serverless + openwhisk.
 
 <div class="docsSections">
   <div class="docsSection">