diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index ff21916..0b64854 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -29,7 +29,7 @@
                     {% elsif page.url == subfolderitem.url %}
                     <li class="active"><a href="{{subfolderitem.url | remove: "/" | append: ".html"}}">{{subfolderitem.title}}</a></li>
                     {% else %}
-                    <li><a href="{{subfolderitem.url | remove: "/" | append: ".html"}}">{{subfolderitem.title}}"</a></li>
+                    <li><a href="{{subfolderitem.url | remove: "/" | append: ".html"}}">{{subfolderitem.title}}</a></li>
                     {% endif %}
                     {% endif %}
                     {% endfor %}
diff --git a/_includes/taglogic.html b/_includes/taglogic.html
index ea3f542..32dd027 100644
--- a/_includes/taglogic.html
+++ b/_includes/taglogic.html
@@ -6,7 +6,7 @@
     {% for tag in page.tags %}
         {% if tag == thisTag %}
 
-        <tr><td><a href="{{ page.url | remove: "/"}}">{{page.title}}</a></td>
+        <tr><td><a href="{{ page.url | remove: "/" | append: ".html" }}">{{page.title}}</a></td>
             <td><span class="label label-default">Page</span></td>
           <td>{% if page.summary %} {{ page.summary | strip_html | strip_newlines | truncate: 160 }} {% else %} {{ page.content | truncatewords: 50 | strip_html }} {% endif %}</td>
         </tr>
@@ -19,7 +19,7 @@
         {% for tag in post.tags %}
         {% if tag == thisTag %}
 
-        <tr><td><a href="{{ post.url | remove: "/"}}">{{post.title}}</a></td>
+        <tr><td><a href="{{ post.url | remove: "/" | append: ".html" }}">{{post.title}}</a></td>
             <td><span class="label label-primary">Post</span></td>
             <td>{% if post.summary %} {{ post.summary | strip_html | strip_newlines | truncate: 160 }} {% else %} {{ post.content | truncatewords: 50 | strip_html }} {% endif %}</td>
         </tr>
diff --git a/_layouts/page.html b/_layouts/page.html
index 5ac7435..b52e6d0 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -55,7 +55,7 @@ layout: default
     {% assign projectTags = site.data.tags.allowed-tags %}
     {% for tag in page.tags %}
     {% if projectTags contains tag %}
-    <a href="{{ "tag_" | append: tag }}" class="btn btn-default navbar-btn cursorNorm" role="button">{{page.tagName}}{{tag}}</a>
+    <a href="{{ "tag_" | append: tag | append: ".html" }}" class="btn btn-default navbar-btn cursorNorm" role="button">{{page.tagName}}{{tag}}</a>
     {% endif %}
     {% endfor %}
     {% endif %}
diff --git a/_pages/mydoc/mydoc_tags.md b/_pages/mydoc/mydoc_tags.md
index 95ff399..88ee65a 100644
--- a/_pages/mydoc/mydoc_tags.md
+++ b/_pages/mydoc/mydoc_tags.md
@@ -64,7 +64,7 @@ title: "Collaboration pages"
 tagName: collaboration
 search: exclude
 permalink: tag_collaboration/
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 ---
 {% include taglogic.html %}
    ```
diff --git a/_pages/news/news_archive.html b/_pages/news/news_archive.html
index 0ef4b2e..5a9c584 100644
--- a/_pages/news/news_archive.html
+++ b/_pages/news/news_archive.html
@@ -1,6 +1,6 @@
 ---
 title: News
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 keywords: news, blog, updates, release notes, announcements
 permalink: news_archive
 toc: false
diff --git a/_pages/tags/tag_collaboration.md b/_pages/tags/tag_collaboration.md
index 9b10ae1..ac1d565 100644
--- a/_pages/tags/tag_collaboration.md
+++ b/_pages/tags/tag_collaboration.md
@@ -3,7 +3,7 @@ title: "Collaboration pages"
 tagName: collaboration
 search: exclude
 permalink: tag_collaboration
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_content_types.md b/_pages/tags/tag_content_types.md
index 112b178..85603db 100644
--- a/_pages/tags/tag_content_types.md
+++ b/_pages/tags/tag_content_types.md
@@ -3,7 +3,7 @@ title: "Content types pages"
 tagName: content_types
 search: exclude
 permalink: tag_content_types
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_formatting.md b/_pages/tags/tag_formatting.md
index 9957bdc..39e75c5 100644
--- a/_pages/tags/tag_formatting.md
+++ b/_pages/tags/tag_formatting.md
@@ -3,7 +3,7 @@ title: "Formatting pages"
 tagName: formatting
 search: exclude
 permalink: tag_formatting
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_getting_started.md b/_pages/tags/tag_getting_started.md
index e0c220f..bb07919 100644
--- a/_pages/tags/tag_getting_started.md
+++ b/_pages/tags/tag_getting_started.md
@@ -3,7 +3,7 @@ title: "Getting started pages"
 tagName: getting_started
 search: exclude
 permalink: tag_getting_started
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_mobile.md b/_pages/tags/tag_mobile.md
index 049759c..c8b3fbe 100644
--- a/_pages/tags/tag_mobile.md
+++ b/_pages/tags/tag_mobile.md
@@ -3,8 +3,7 @@ title: "Mobile Pages"
 search: exclude
 tagName: mobile
 permalink: tag_mobile
-sidebar: tags_sidebar
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_navigation.md b/_pages/tags/tag_navigation.md
index 13277fa..2d3b1ee 100644
--- a/_pages/tags/tag_navigation.md
+++ b/_pages/tags/tag_navigation.md
@@ -3,7 +3,7 @@ title: "Navigation pages"
 tagName: navigation
 search: exclude
 permalink: tag_navigation
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_news.md b/_pages/tags/tag_news.md
index 32db9ad..1dff410 100644
--- a/_pages/tags/tag_news.md
+++ b/_pages/tags/tag_news.md
@@ -3,7 +3,7 @@ title: "News"
 tagName: news
 search: exclude
 permalink: tag_news
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_publishing.md b/_pages/tags/tag_publishing.md
index 2234b96..30ac1f7 100644
--- a/_pages/tags/tag_publishing.md
+++ b/_pages/tags/tag_publishing.md
@@ -3,7 +3,7 @@ title: "Publishing pages"
 tagName: publishing
 search: exclude
 permalink: tag_publishing
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_single_sourcing.md b/_pages/tags/tag_single_sourcing.md
index ae73507..1e53c2b 100644
--- a/_pages/tags/tag_single_sourcing.md
+++ b/_pages/tags/tag_single_sourcing.md
@@ -3,7 +3,7 @@ title: "Single sourcing pages"
 tagName: single_sourcing
 search: exclude
 permalink: tag_single_sourcing
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}
diff --git a/_pages/tags/tag_special_layouts.md b/_pages/tags/tag_special_layouts.md
index afae74c..8edae31 100644
--- a/_pages/tags/tag_special_layouts.md
+++ b/_pages/tags/tag_special_layouts.md
@@ -3,7 +3,7 @@ title: "Special layout pages"
 tagName: special_layouts
 search: exclude
 permalink: tag_special_layouts
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 
diff --git a/_pages/tags/tag_troubleshooting.md b/_pages/tags/tag_troubleshooting.md
index 9f6456a..df53567 100644
--- a/_pages/tags/tag_troubleshooting.md
+++ b/_pages/tags/tag_troubleshooting.md
@@ -3,7 +3,7 @@ title: "Troubleshooting pages"
 tagName: troubleshooting
 search: exclude
 permalink: tag_troubleshooting
-sidebar: tags_sidebar
+sidebar: mydoc_sidebar
 folder: tags
 ---
 {% include taglogic.html %}