diff --git a/website/source/community-plugins.html.md b/website/source/community-plugins.html.md
new file mode 100644
index 000000000..48f2f740c
--- /dev/null
+++ b/website/source/community-plugins.html.md
@@ -0,0 +1,42 @@
+---
+layout: "community"
+page_title: "Community Maintained Plugins"
+sidebar_current: "community-plugins"
+description: |-
+  Packer maintains these core plugins.
+---
+
+# Community Maintained Plugins
+
+The following plugins (i.e. Builders, Provisioners, and Post-Processors) are
+maintained by HashiCorp. Any plugins not on this list are maintained by the
+community, and not actively contributed to by HashiCorp, although they are
+still distributed with Packer.
+
+## Builders
+
+- Amazon EC2
+- Azure
+- Docker
+- Google Cloud
+- VMware
+- VirtualBox
+
+## Provisioners
+
+- File
+- PowerShell
+- Shell
+- Windows Restart
+- Windows Shell
+
+## Post-Processors
+
+- Amazon Import
+- Artifice
+- Atlas
+- Docker
+- Local Shell
+- Manifest
+- Vagrant
+- Vagrant Cloud
diff --git a/website/source/downloads-community.html.md b/website/source/community-tools.html.md
similarity index 73%
rename from website/source/downloads-community.html.md
rename to website/source/community-tools.html.md
index dacbed8e4..5a31fa7cc 100644
--- a/website/source/downloads-community.html.md
+++ b/website/source/community-tools.html.md
@@ -1,7 +1,7 @@
 ---
-layout: "downloads"
+layout: "community"
 page_title: "Download Packer Community Projects"
-sidebar_current: "downloads-community"
+sidebar_current: "community-tools"
 description: |-
   Packer has a vibrant community of contributors who have built a number of
   great tools on top of Packer. There are also quite a few projects
@@ -46,38 +46,3 @@ power of Packer templates.
 ## Other
 
 - [suitcase](https://github.com/tmclaugh/suitcase) - Packer based build system for CentOS OS images
-
-## Community Maintained Plugins
-
-The following plugins (i.e. Builders, Provisioners, and Post-Processors) are
-maintained by HashiCorp. Any plugins not on this list are maintained by the
-community, and not actively contributed to by HashiCorp, although they are
-still distributed with Packer.
-
-### Builders
-
-- Amazon EC2
-- Azure
-- Docker
-- Google Cloud
-- VMware
-- VirtualBox
-
-### Provisioners
-
-- File
-- PowerShell
-- Shell
-- Windows Restart
-- Windows Shell
-
-### Post-Processors
-
-- Amazon Import
-- Artifice
-- Atlas
-- Docker
-- Local Shell
-- Manifest
-- Vagrant
-- Vagrant Cloud
diff --git a/website/source/community.html.erb b/website/source/community.html.erb
index ca4200f9b..ef6130d6c 100644
--- a/website/source/community.html.erb
+++ b/website/source/community.html.erb
@@ -1,6 +1,7 @@
 ---
-layout: "inner"
+layout: "community"
 page_title: "Community"
+sidebar_current: "community-index"
 description: |-
   Packer is an open source project with a growing community.
 ---
diff --git a/website/source/layouts/community.erb b/website/source/layouts/community.erb
new file mode 100644
index 000000000..a5ab417c3
--- /dev/null
+++ b/website/source/layouts/community.erb
@@ -0,0 +1,19 @@
+<% 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("community-index") %>>
+          <a href="/community.html">Community</a>
+        </li>
+        <li<%= sidebar_current("community-tools") %>>
+          <a href="/community-tools.html">Community Tools</a>
+        </li>
+        <li<%= sidebar_current("community-plugins") %>>
+          <a href="/community-plugins.html">Community Maintained Plugins</a>
+        </li>
+      </ul>
+    </div>
+  <% end %>
+
+  <%= yield %>
+<% end %>
diff --git a/website/source/layouts/downloads.erb b/website/source/layouts/downloads.erb
index 9e9a79632..e6a328f41 100644
--- a/website/source/layouts/downloads.erb
+++ b/website/source/layouts/downloads.erb
@@ -6,10 +6,6 @@
           <a href="/downloads.html">Download Packer</a>
         </li>
 
-        <li<%= sidebar_current("downloads-community") %>>
-          <a href="/downloads-community.html">Community Tools</a>
-        </li>
-
         <li>
           <a href="/docs/install/index.html">Build from Source</a>
         </li>