diff --git a/packages/composer-website/jekylldocs/_includes/indexnavbar.html b/packages/composer-website/jekylldocs/_includes/indexnavbar.html
index e6e491ae50..ad48b3b5ca 100644
--- a/packages/composer-website/jekylldocs/_includes/indexnavbar.html
+++ b/packages/composer-website/jekylldocs/_includes/indexnavbar.html
@@ -8,7 +8,7 @@
         <!-- <li><a href="https://composer-playground.mybluemix.net" title="Composer">Playground</a></li> -->
         <li><a href="{{site.baseurl}}/tutorials/tutorials.html">Tutorials</a></li>
         <li><a href="{{site.baseurl}}/introduction/introduction.html">Docs</a></li>
-        <li><a href="{{site.baseurl}}/support/index.html">Community</a></li>
+        <li><a href="{{site.baseurl}}/support/support-index.html">Community</a></li>
       </ul>
     </div>
   </div>
diff --git a/packages/composer-website/jekylldocs/_includes/navbar.html b/packages/composer-website/jekylldocs/_includes/navbar.html
index 17d05ee69b..f3089efe0a 100644
--- a/packages/composer-website/jekylldocs/_includes/navbar.html
+++ b/packages/composer-website/jekylldocs/_includes/navbar.html
@@ -13,7 +13,7 @@
                 </li> -->
                     <a href="../tutorials/tutorials.html">Tutorials</a>
                     <a href="../introduction/introduction.html">Docs</a>
-                    <a href="../support/index.html">Community</a>
+                    <a href="../support/support-index.html">Community</a>
             </div>
         </div>
 </nav>
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/accordion-toc0.md b/packages/composer-website/jekylldocs/_includes/sidebars/accordion-toc0.md
index a127f49168..5077d64c02 100644
--- a/packages/composer-website/jekylldocs/_includes/sidebars/accordion-toc0.md
+++ b/packages/composer-website/jekylldocs/_includes/sidebars/accordion-toc0.md
@@ -2,10 +2,12 @@
 {% for page in sorted %}
 {% if page.index-order %}
 {% capture mods %}{{ page.index-order | modulo:100 }}{% endcapture %}
-{% if mods == "0" %}
+{% if mods == "0" and page.exception == nil %}
 - [{{ page.title }}](..{{page.url}}.html)
-{% elsif mods != "0" %}
+{% elsif mods != "0" and page.exception == nil %}
   - [{{page.title}}](..{{page.url}}.html)
+{% elsif page.title == "API Documentation" page.exception == API %}
+  - [API Documentation](../jsdoc/index.html)
 {% endif %}
 {% endif %}
 {% endfor %}
diff --git a/packages/composer-website/jekylldocs/index.html b/packages/composer-website/jekylldocs/index.html
index 478c8efefa..41fc664182 100644
--- a/packages/composer-website/jekylldocs/index.html
+++ b/packages/composer-website/jekylldocs/index.html
@@ -91,7 +91,7 @@ <h2>Calls happen every Thursday.</h2>
             <p><a href="https://chat.hyperledger.org/channel/composer">chat.hyperledger.org</a></p></div>
           </div>
       </div>
-      <p>Visit the <a href="{{site.baseurl}}/support/index.html" class="community">community</a> page for more information.</p>
+      <p>Visit the <a href="{{site.baseurl}}/support/support-index.html" class="community">community</a> page for more information.</p>
   </div>
 </div>
 </div>
diff --git a/packages/composer-website/jekylldocs/installing/installing-index.md b/packages/composer-website/jekylldocs/installing/installing-index.md
index 1faca292e8..0f09336700 100644
--- a/packages/composer-website/jekylldocs/installing/installing-index.md
+++ b/packages/composer-website/jekylldocs/installing/installing-index.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Installing Index
+title: Installing Hyperledger Composer
 category: tasks
 sidebar: sidebars/accordion-toc0.md
 section: installing
@@ -14,7 +14,7 @@ excerpt: Tutorials
 
 {% assign sorted = site.pages | sort: 'index-order' %}
 {% for page in sorted %}
-{% if page.section == 'installing' and page.title != "Installing Index" %}
+{% if page.section == 'installing' and page.title != "Installing" %}
 ### {{ page.title }}
 {{ page.excerpt }}
 {% endif %}
diff --git a/packages/composer-website/jekylldocs/installing/using-playground-locally.md b/packages/composer-website/jekylldocs/installing/using-playground-locally.md
index 45ee487658..2824f84f6e 100644
--- a/packages/composer-website/jekylldocs/installing/using-playground-locally.md
+++ b/packages/composer-website/jekylldocs/installing/using-playground-locally.md
@@ -36,7 +36,7 @@ docker images -aq | xargs docker rmi -f
 
         curl -sSL https://hyperledger.github.io/composer/install-hlfv1.sh | bash
 
-2. Access your local {{site.data.conrefs.composer_full}} Playground by clicking this link: <a href="http://localhost:8080" target="blank">http://<span></span>localhost:8080</a>.
+2. Access your local {{site.data.conrefs.composer_full}} Playground by clicking this link: <a href="http://localhost:8080" target="blank">http://<span></span>localhost:8080</a>. *Please note*: Private browsing is not supported when running the Playground locally.
 
 
 ## Deploying business networks to {{site.data.conrefs.hlf_full}} v1.0
diff --git a/packages/composer-website/jekylldocs/integrating/integrating-index.md b/packages/composer-website/jekylldocs/integrating/integrating-index.md
index c09539f579..24d3f48a35 100644
--- a/packages/composer-website/jekylldocs/integrating/integrating-index.md
+++ b/packages/composer-website/jekylldocs/integrating/integrating-index.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Integrating Index
+title: Integrating Existing Systems
 category: concepts
 section: integrating
 index-order: 600
@@ -16,7 +16,7 @@ excerpt: How to create a new Connection Profile
 
 {% assign sorted = site.pages | sort: 'index-order' %}
 {% for page in sorted %}
-{% if page.section == 'integrating' and page.title != "Integrating Index" %}
+{% if page.section == 'integrating' and page.title != "Integrating Existing Systems" %}
 ### {{ page.title }}
 {{ page.excerpt }}
 {% endif %}
diff --git a/packages/composer-website/jekylldocs/managing/github-oauth.md b/packages/composer-website/jekylldocs/managing/github-oauth.md
index 401d9ab772..eb6b2b3b61 100644
--- a/packages/composer-website/jekylldocs/managing/github-oauth.md
+++ b/packages/composer-website/jekylldocs/managing/github-oauth.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Enabling Playground OAuth with GitHub
+title: Enabling playground OAuth with GitHub
 category: tasks
 section: managing
 sidebar: sidebars/accordion-toc0.md
diff --git a/packages/composer-website/jekylldocs/managing/managingindex.md b/packages/composer-website/jekylldocs/managing/managingindex.md
index 1e8f06b072..2de89ec37f 100644
--- a/packages/composer-website/jekylldocs/managing/managingindex.md
+++ b/packages/composer-website/jekylldocs/managing/managingindex.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Managing Index
+title: Managing a Deployed Business Network
 category: concepts
 section: managing
 index-order: 700
@@ -12,7 +12,7 @@ excerpt: "Managing your {{site.data.conrefs.composer_full}}"
 
 {% assign sorted = site.pages | sort: 'index-order' %}
 {% for page in sorted %}
-{% if page.section == 'managing' and page.title != "Managing Index" %}
+{% if page.section == 'managing' and page.title != "Managing a Deployed Business Network" %}
 ### {{ page.title }}
 {{ page.excerpt }}
 {% endif %}
diff --git a/packages/composer-website/jekylldocs/reference/reference-index.md b/packages/composer-website/jekylldocs/reference/reference-index.md
index 90eef32e4a..eb1774bc26 100644
--- a/packages/composer-website/jekylldocs/reference/reference-index.md
+++ b/packages/composer-website/jekylldocs/reference/reference-index.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Reference Index
+title: Reference
 section: reference
 index-order: 900
 sidebar: sidebars/accordion-toc0.md
@@ -15,7 +15,7 @@ The {{site.data.conrefs.composer_full}} reference material contains a number of
 
 {% assign sorted = site.pages | sort: 'index-order' %}
 {% for page in sorted %}
-{% if page.section == 'reference' and page.title != "Reference Index" or page.exception == 'API' %}
+{% if page.section == 'reference' and page.title != "Reference" or page.exception == 'API' %}
 ### {{ page.title }}
 {{ page.excerpt }}
 {% endif %}
diff --git a/packages/composer-website/jekylldocs/tutorials/tutorials.md b/packages/composer-website/jekylldocs/tutorials/tutorials.md
index 8d91c1d5bc..a32390f042 100644
--- a/packages/composer-website/jekylldocs/tutorials/tutorials.md
+++ b/packages/composer-website/jekylldocs/tutorials/tutorials.md
@@ -1,6 +1,6 @@
 ---
 layout: default
-title: Tutorials Index
+title: Tutorials
 category: tutorials
 section: tutorials
 sidebar: sidebars/accordion-toc0.md