diff --git a/view/databases.html b/view/databases.html
index cc7da070..db1a1456 100644
--- a/view/databases.html
+++ b/view/databases.html
@@ -20,10 +20,10 @@ <h3 class="sidebar_middle_title">Multi-Cloud Databases</h3>
               <h3 class="sidebar_middle_title">Supported Databases</h3>
               <ul class="sidebar_menu">
                 <li><a href="#datastore">Built-in Datastore</a> </li>
-                <li><a href="#couchdb">CouchDB</a> </li>
+                <!-- <li><a href="#couchdb">CouchDB</a> </li>
                 <li><a href="#redis">Redis</a> </li>
                 <li><a href="#mongodb">MongoDB</a> </li>
-                <li><a href="#dynamodb">DynamoDB</a> </li>
+                <li><a href="#dynamodb">DynamoDB</a> </li> -->
               </ul>
             </aside>
             <aside class="left_widget blog_border0">
@@ -45,11 +45,13 @@ <h3 class="sidebar_middle_title">Additional Resources</h3>
           <div class="col-lg-12 col-md-12 col-sm-12 item">
             <div class="content">
 
+              <a name="multi-cloud-databases"></a>
               <h2>Multi-cloud Databases</h2>
 
               <p>{{appName}} works with all major known database technologies.</p>
               <p>We've listed some of the Database we've tested, but most Database technologies should work.</p>
 
+              <a name="supported-databases"></a>
               <h2>Supported Databases</h2>
               <ul>
                 <li>Built-in Datastore</li>
diff --git a/view/docs.html b/view/docs.html
index bad86b6f..c6502b60 100644
--- a/view/docs.html
+++ b/view/docs.html
@@ -12,8 +12,8 @@ <h1>Documentation</h1>
             <aside class="left_widget blog_border0">
               <h3 class="sidebar_middle_title">Getting Started</h3>
               <ul class="sidebar_menu">
-                <li><a href="{{appUrl}}/faq">What is a Microservice?</a></li>
-                <li><a href="{{appUrl}}/faq">Don't start a server!</a></li>
+                <li><a href="{{appUrl}}/faq#what-is-a-microservice">What is a Microservice?</a></li>
+                <li><a href="{{appUrl}}/faq#no-servers">Don't start a server!</a></li>
                 <li><a href="#language" class="i18n">Choosing a Language</a></li>
                 <li><a href="{{appUrl}}/examples" class="i18n">Interactive Examples</a></li>
                 <li><a href="{{appUrl}}/editor" class="i18n">Interactive Playground</a></li>
@@ -178,15 +178,15 @@ <h2 class="i18n">Getting Started</h2>
                   <p><span>To see example Hooks which you can <a href="#forking">fork</a> visit:</span> <a class="i18n" href="{{appUrl}}/examples">Examples</a></p>
                   <p>
                     <ul style="font-size:22px;">
-                      <li><a href="#datastore" class="i18n">Getting Started</a></li>
-                      <li><a href="#files" class="i18n">Running Services</a></li>
-                      <li><a href="#domains" class="i18n">Sending Data to Services</a></li>
-                      <li><a href="#events" class="i18n">Managing Services</a></li>
-                      <li><a href="#api" class="i18n">Service Features</a></li>
-                      <li><a href="#ssl" class="i18n">Role Based Access Control</a></li>
-                      <li><a href="#ssl" class="i18n">Logging and Events</a></li>
-                      <li><a href="#ssl" class="i18n">Multi-Cloud Databases</a></li>
-                      <li><a href="#ssl" class="i18n">Multi-Cloud File Storage</a></li>
+                      <li><a href="#language" class="i18n">Getting Started</a></li>
+                      <li><a href="#running" class="i18n">Running Services</a></li>
+                      <li><a href="#data" class="i18n">Sending Data to Services</a></li>
+                      <li><a href="#admin" class="i18n">Managing Services</a></li>
+                      <li><a href="#schema" class="i18n">Service Features</a></li>
+                      <li><a href="#keys" class="i18n">Role Based Access Control</a></li>
+                      <li><a href="#logs" class="i18n">Logging and Events</a></li>
+                      <li><a href="databases#multi-cloud-databases" class="i18n">Multi-Cloud Databases</a></li>
+                      <li><a href="files" class="i18n">Multi-Cloud File Storage</a></li>
                       <!-- <li><a href="#metrics">Hook Metrics</a></li> -->
                     </ul>
                   </p>
diff --git a/view/layout.html b/view/layout.html
index c335e810..0c8ebade 100644
--- a/view/layout.html
+++ b/view/layout.html
@@ -203,16 +203,16 @@
                 <li><a href="{{appUrl}}/microservices" class="i18n">Microservices</a>
                   <div class="megamenu">
                     <div class="mega">
-                      <h2><a href="{{appUrl}}/faq#getting-started">Getting Started</a></h2>
+                      <h2>Getting Started</h2>
                       <a href="{{appUrl}}/faq#what-is-a-microservice">What is a Microservice?</a>
                       <a href="{{appUrl}}/editor">Interactive Playground</a>
                       <a href="{{appUrl}}/examples">Live Examples</a>
-                      <a href="{{appUrl}}/faq#deploying-first-service">Deploying your first service</a>
+                      <a href="{{appUrl}}/faq#creating">Deploying your first service</a>
                       <a href="{{appUrl}}/docs">Documentation</a>
                       <a href="{{appUrl}}/pricing">Paid Plans</a>
                     </div>
                     <div class="mega">
-                      <h2><a href="#">Technologies</a></h2>
+                      <h2>Technologies</h2>
                       <a href="{{appUrl}}/webhooks">Webhooks</a>
                       <a href="{{appUrl}}/websockets">Websockets</a>
                       <a href="{{appUrl}}/api#rest">HTTP REST</a>
@@ -221,7 +221,7 @@ <h2><a href="#">Technologies</a></h2>
                       <a href="{{appUrl}}/docs#content-type">Streaming Form multipart</a>
                     </div>
                     <div class="mega">
-                      <h2><a href="#">Features</a></h2>
+                      <h2>Features</h2>
                       <a href="{{appUrl}}/domains">Domains</a>
                       <a href="{{appUrl}}/cron">Cron Jobs</a>
                       <a href="{{appUrl}}/docs#schema">Schema</a>
@@ -238,7 +238,6 @@ <h2><a href="{{appUrl}}/examples">Languages</a></h2>
                       <a href="{{appUrl}}/examples#bash">Bash</a>
                       <a href="{{appUrl}}/examples#lua">Lua</a>
                       <a href="{{appUrl}}/examples">many more...</a>
-                      
                     </div>
                   </div>
                 </li>
@@ -256,33 +255,33 @@ <h2><a href="{{appUrl}}/examples">Languages</a></h2>
                 <li><a href="{{appUrl}}/databases" class="i18n">Databases</a>
                   <div class="megamenu men_longwidth">
                     <div class="mega">
-                      <h2><a href="{{appUrl}}/databases">Using Databases</a></h2>
-                      <a href="{{appUrl}}/docs#databases">Documentation</a>
-                      <a href="{{appUrl}}/databases#api">API</a>
-                      <a href="{{appUrl}}/databases#sdk">SDK</a>
+                      <h2><a href="{{appUrl}}/databases#using-databases">Using Databases</a></h2>
+                      <a href="{{appUrl}}/databases">Documentation</a>
+                      <!-- <a href="{{appUrl}}/databases#api">API</a>
+                      <a href="{{appUrl}}/databases#sdk">SDK</a> -->
                     </div>
                     <div class="mega">
-                      <h2><a href="#" class="i18n">Multi-Cloud</a></h2>
+                      <h2>Multi-Cloud</h2>
                       <a href="{{appUrl}}/datastore">Built-in Datastore</a>
-                      <a href="{{appUrl}}/databases#dynamodb">Amazon DynamoDB</a>
+                      <!-- <a href="{{appUrl}}/databases#dynamodb">Amazon DynamoDB</a>
                       <a href="{{appUrl}}/databases#couchdb">CouchDB</a>
                       <a href="{{appUrl}}/databases#mongodb">MongoDB</a>
-                      <a href="{{appUrl}}/databases#redis">Redis</a>
+                      <a href="{{appUrl}}/databases#redis">Redis</a> -->
                     </div>
-                    <div class="mega">
+                    <!-- <div class="mega">
                       <h2><a href="{{appUrl}}/databases#examples" class="i18n">Example Code</a></h2>
                       <a href="{{appUrl}}/examples#">Create a new Document</a>
                       <a href="{{appUrl}}/examples#">Get a Document</a>
                       <a href="{{appUrl}}/examples#">Query for a Document</a>
                       <a href="{{appUrl}}/examples#">Remove a Document</a>
-                    </div>
+                    </div> -->
                   </div>
                 </li>
                 <li><a href="{{appUrl}}/files" class="i18n">File Storage</a>
                   <div class="megamenu">
                     <div class="mega">
                       <h2><a href="{{appUrl}}/files">Using Files</a></h2>
-                      <a href="{{appUrl}}/files#docs">Documentation</a>
+                      <a href="{{appUrl}}/files">Documentation</a>
                       <a href="{{appUrl}}/files#api">API</a>
                       <a href="{{appUrl}}/files#sdk">SDK</a>
                     </div>
@@ -292,7 +291,7 @@ <h2><a href="{{appUrl}}/files#providers" class="i18n">Multi-cloud</a></h2>
                       <a href="{{appUrl}}/files#google">Google Cloud</a>
                       <a href="{{appUrl}}/files#microsoft">Mirosoft Azure</a>
                       <a href="{{appUrl}}/files#rackspace">Rackspace Cloud Files</a>
-                      <a href="{{appUrl}}/files#sftp">SSH / SFTP</a>
+                      <a href="{{appUrl}}/files#sftp-ssh">SSH / SFTP</a>
                     </div>
                     <div class="mega">
                       <h2><a href="{{appUrl}}/examples#files" class="i18n">Example Code</a></h2>
@@ -308,15 +307,15 @@ <h2><a href="{{appUrl}}/examples#files" class="i18n">Example Code</a></h2>
                   <ul class="sub_menu">
                     <li><a href="{{appUrl}}/keys">API Access Keys</a></li>
                     <li><a href="{{appUrl}}/roles">System Roles</a></li>
-                    <li><a href="{{appUrl}}/roles#custom">Custom Roles</a></li>
+                    <!-- <li><a href="{{appUrl}}/roles#custom">Custom Roles</a></li> -->
                     <li><a href="{{appUrl}}/roles#custom-role-checks">Performing Role Checks</a></li>
                   </ul>               
                 </li>
                 <li><a href="{{appUrl}}/api">Developer API</a>
                   <ul class="sub_menu">
-                    <li><a href="{{appUrl}}/api#getting-started">Getting Started</a></li>
-                    <li><a href="{{appUrl}}/api#access-keys">API Access Keys</a></li>
-                    <li><a href="{{appUrl}}/api#http">HTTP REST API</a></li>
+                    <li><a href="{{appUrl}}/api#microservices">Hosted Microservices and Webhooks</a></li>
+                    <li><a href="{{appUrl}}/api#keys">API Access Keys</a></li>
+                    <li><a href="{{appUrl}}/api#rest">HTTP REST API</a></li>
                     <li><a href="{{appUrl}}/sdk">Client SDK</a></li>
                     <li><a href="{{appUrl}}/gateways">Hot Code Gateways</a></li>
                   </ul>
@@ -344,9 +343,9 @@ <h2><a href="{{appUrl}}/examples#files" class="i18n">Example Code</a></h2>
                 
                 <li><a href="{{appUrl}}/microservices">Microservices</a>
                   <ul>
-                    <li><a href="{{appUrl}}/faq#">What is a Microservice?</a></li>
-                    <li><a href="{{appUrl}}/faq#">Interactive Playground</a></li>
-                    <li><a href="{{appUrl}}/faq#">Deploying your first service</a></li>
+                    <li><a href="{{appUrl}}/faq#what-is-a-microservice">What is a Microservice?</a></li>
+                    <li><a href="{{appUrl}}/editor">Interactive Playground</a></li>
+                    <li><a href="{{appUrl}}/faq#creating">Deploying your first service</a></li>
                     <li><a href="{{appUrl}}/docs">Documentation</a></li>
                     <li><a href="{{appUrl}}/pricing">Paid Plans</a></li>
                   </ul>
@@ -364,11 +363,11 @@ <h2><a href="{{appUrl}}/examples#files" class="i18n">Example Code</a></h2>
                 <li><a href="{{appUrl}}/databases">Databases</a>
                   <ul>
                     <li><a href="{{appUrl}}/datastore">Built-in Datastore</a></li>
-                    <li><a href="{{appUrl}}/databases/dynamodb">Amazon DynamoDB</a></li>
+                    <!-- <li><a href="{{appUrl}}/databases/dynamodb">Amazon DynamoDB</a></li>
                     <li><a href="{{appUrl}}/databases/couchdb">CouchDB</a></li>
                     <li><a href="{{appUrl}}/databases/mongodb">MongoDB</a></li>
                     <li><a href="{{appUrl}}/databases/redis">Redis</a></li>
-                    <li><a href="{{appUrl}}/databases#additional">More...</a></li>
+                    <li><a href="{{appUrl}}/databases#additional">More...</a></li> -->
                   </ul>
                 </li>
                 <li><a href="{{appUrl}}/files">File Storage</a>
@@ -377,22 +376,22 @@ <h2><a href="{{appUrl}}/examples#files" class="i18n">Example Code</a></h2>
                     <li><a href="{{appUrl}}/files#google">Google Cloud</a></li>
                     <li><a href="{{appUrl}}/files#microsoft">Mirosoft Azure</a></li>
                     <li><a href="{{appUrl}}/files#rackspace">Rackspace Cloud Files</a></li>
-                    <li><a href="{{appUrl}}/files#sftp">SSH / SFTP</a></li>
+                    <li><a href="{{appUrl}}/files#sftp-ssh">SSH / SFTP</a></li>
                   </ul>             
                 </li>
                 <li><a href="{{appUrl}}/keys">Role Based Access Control</a>
                   <ul>
                     <li><a href="{{appUrl}}/keys">API Access Keys</a></li>
                     <li><a href="{{appUrl}}/roles">System Roles</a></li>
-                    <li><a href="{{appUrl}}/roles#custom">Custom Roles</a></li>
+                    <!-- <li><a href="{{appUrl}}/roles#custom">Custom Roles</a></li> -->
                     <li><a href="{{appUrl}}/roles#custom-role-checks">Performing Role Checks</a></li>
                   </ul>             
                 </li>
                 <li><a href="{{appUrl}}/api">Developer API</a>
                   <ul>
-                    <li><a href="{{appUrl}}/api#getting-started">Getting Started</a></li>
-                    <li><a href="{{appUrl}}/api#access-keys">API Access Keys</a></li>
-                    <li><a href="{{appUrl}}/api#http">HTTP REST API</a></li>
+                    <li><a href="{{appUrl}}/api#microservices">Hosted Microservices and Webhooks</a></li>
+                    <li><a href="{{appUrl}}/api#keys">API Access Keys</a></li>
+                    <li><a href="{{appUrl}}/api#rest">HTTP REST API</a></li>
                     <li><a href="{{appUrl}}/sdk">Client SDK</a></li>
                     <li><a href="{{appUrl}}/gateways">Hot Code Gateways</a></li>
                   </ul>