diff --git a/site/_includes/primary-nav-items.html b/site/_includes/primary-nav-items.html
index 6c816b6e..f67b1fad 100644
--- a/site/_includes/primary-nav-items.html
+++ b/site/_includes/primary-nav-items.html
@@ -8,6 +8,9 @@
   <li class="{% if page.author %}current{% endif %}">
     <a href="/news/">News</a>
   </li>
+  <li class="{% if page.url contains '/community/' %}current{% endif %}">
+    <a href="/community/">Community</a>
+  </li>
   <li class="{% if page.url contains '/help/' %}current{% endif %}">
     <a href="/help/">Help</a>
   </li>
diff --git a/site/_sass/_style.scss b/site/_sass/_style.scss
index 540c4cc9..10b1b0e2 100644
--- a/site/_sass/_style.scss
+++ b/site/_sass/_style.scss
@@ -56,6 +56,7 @@ nav {
   ul {
     padding: 0;
     margin: 0;
+    white-space: nowrap;
   }
 
   li { display: inline-block; }
diff --git a/site/_docs/jekyllconf.md b/site/community/index.md
similarity index 88%
rename from site/_docs/jekyllconf.md
rename to site/community/index.md
index baf4d457..981a465b 100644
--- a/site/_docs/jekyllconf.md
+++ b/site/community/index.md
@@ -1,10 +1,10 @@
 ---
-layout: docs
-title: JekyllConf
-permalink: /docs/jekyllconf/
+layout: page
+title: Community
+permalink: /community/
 ---
 
-[JekyllConf](http://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](http://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned or meta Jekyll topics. 
+[JekyllConf](http://jekyllconf.com) is a free, online conference for all things Jekyll hosted by [CloudCannon](http://cloudcannon.com). Each year members of the Jekyll community speak about interesting use cases, tricks they've learned, or meta Jekyll topics. 
 
 ## Featured
 {% assign random = site.time | date: "%s%N" | modulo: site.data.jekyllconf-talks.size %}