diff --git a/.htaccess b/.htaccess
index 865d77ff..118f8abf 100644
--- a/.htaccess
+++ b/.htaccess
@@ -15,3 +15,5 @@ redirect 301 /doc/sbt/cross-building.html {{ BASE_PATH }}/doc/project/cross-buil
 redirect 301 /doc/sbt/ {{ BASE_PATH }}/doc/project/
 
 redirect 301 /downloads.html {{ BASE_PATH }}/doc/internals/downloads.html
+
+RewriteRule ^/community/libraries/(.*)$ /libraries/$1 [R=301,NC,L]
diff --git a/_data/community.yml b/_data/community.yml
index fb2ab973..3e6a713a 100644
--- a/_data/community.yml
+++ b/_data/community.yml
@@ -1,15 +1,4 @@
 - text: Community
   url: /community/
-- text: Libraries and skeletons
-  url: /community/libraries/
-  subitems:
-    - text: JavaScript libraries
-      url: /community/libraries/facades.html
-    - text: Scala libraries
-      url: /community/libraries/libs.html
-    - text: Testing frameworks
-      url: /community/libraries/testing.html
-    - text: Skeletons
-      url: /community/libraries/skeletons.html
 - text: Presentations and videos
   url: /community/presentations.html
diff --git a/_data/libraries.yml b/_data/libraries.yml
new file mode 100644
index 00000000..c3fdf609
--- /dev/null
+++ b/_data/libraries.yml
@@ -0,0 +1,10 @@
+- text: Libraries
+  url: /libraries/
+- text: JavaScript libraries
+  url: /libraries/facades.html
+- text: Scala libraries
+  url: /libraries/libs.html
+- text: Testing frameworks
+  url: /libraries/testing.html
+- text: Skeletons
+  url: /libraries/skeletons.html
diff --git a/_includes/css/style.css b/_includes/css/style.css
index 875d106c..c788466f 100644
Binary files a/_includes/css/style.css and b/_includes/css/style.css differ
diff --git a/_includes/nav.html b/_includes/nav.html
index 8e0acbc5..fd1e1512 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -14,6 +14,7 @@
       <ul class="nav navbar-nav">
         <li {% if page.url contains "/doc" %}class="active"{% endif %}><a href="{{"/doc/" | prepend: site.baseurl }}">DOCUMENTATION</a></li>
         <li {% if page.url contains "/tutorial" %}class="active"{% endif %}><a href="{{"/tutorial/" | prepend: site.baseurl }}">TUTORIALS</a></li>
+        <li {% if page.url contains "/libraries" %}class="active"{% endif %}><a href="{{"/libraries/" | prepend: site.baseurl }}">LIBRARIES</a></li>
         <li {% if page.url contains "/community" %}class="active"{% endif %}><a href="{{"/community/" | prepend: site.baseurl }}">COMMUNITY</a></li>
         <li {% if page.url contains "/news" %}class="active"{% endif %}><a href="{{"/news/" | prepend: site.baseurl }}">NEWS</a></li>
         <li><a href="http://github.com/scala-js/scala-js"><img src="{{ BASE_PATH }}/assets/img/github-logo.png" alt="GitHub" height="16" width="16"></a></li>
diff --git a/_layouts/libraries.html b/_layouts/libraries.html
new file mode 100644
index 00000000..6b940f42
--- /dev/null
+++ b/_layouts/libraries.html
@@ -0,0 +1,19 @@
+---
+layout: default
+---
+
+{% include wrap.html %}
+
+<div class="container mtb">
+    <div class="row">
+        <div class="col-md-9">
+            {{ content }}
+            <div class="spacing"></div>
+        </div>
+        <div class="col-md-3">
+            <nav class="toc" role="navigation">
+                {% include docnav.html nav=site.data.libraries%}
+            </nav>
+        </div>
+    </div>
+</div>
diff --git a/community/libraries/facades.md b/libraries/facades.md
similarity index 82%
rename from community/libraries/facades.md
rename to libraries/facades.md
index 346c840d..e26a55a4 100644
--- a/community/libraries/facades.md
+++ b/libraries/facades.md
@@ -1,5 +1,5 @@
 ---
-layout: community
+layout: libraries
 title: JavaScript library facades
 ---
 
@@ -13,10 +13,10 @@ relevant SBT dependency definition.
 {% include library.html lib=site.data.library.jsfacades %}
 
 If you didn't find a facade for the library you'd like to use, it's quite easy to do one yourself. Check out the
-[facade documentation](../../doc/interoperability/facade-types.html) and the
+[facade documentation](../doc/interoperability/facade-types.html) and the
 [TypeScript conversion tool](https://github.com/sjrd/scala-js-ts-importer).
 You can also skip whole facade-business and just
-[call JavaScript APIs dynamically](../../doc/interoperability/facade-types.html#calling-javascript-from-scalajs-with-dynamic-types),
+[call JavaScript APIs dynamically](../doc/interoperability/facade-types.html#calling-javascript-from-scalajs-with-dynamic-types),
 without type-checking, the same way you do it when programming in JavaScript itself.
 
 -------
diff --git a/community/libraries/index.md b/libraries/index.md
similarity index 96%
rename from community/libraries/index.md
rename to libraries/index.md
index af429f84..3032bf4c 100644
--- a/community/libraries/index.md
+++ b/libraries/index.md
@@ -1,5 +1,5 @@
 ---
-layout: community
+layout: libraries
 title: Libraries
 ---
 
diff --git a/community/libraries/libs.md b/libraries/libs.md
similarity index 96%
rename from community/libraries/libs.md
rename to libraries/libs.md
index 16fa4a7b..8e2f6e6d 100644
--- a/community/libraries/libs.md
+++ b/libraries/libs.md
@@ -1,5 +1,5 @@
 ---
-layout: community
+layout: libraries
 title: Scala libraries
 ---
 
diff --git a/community/libraries/skeletons.md b/libraries/skeletons.md
similarity index 98%
rename from community/libraries/skeletons.md
rename to libraries/skeletons.md
index 9d86c633..3e861a09 100644
--- a/community/libraries/skeletons.md
+++ b/libraries/skeletons.md
@@ -1,5 +1,5 @@
 ---
-layout: community
+layout: libraries
 title: Project Skeletons
 ---
 
diff --git a/community/libraries/testing.md b/libraries/testing.md
similarity index 95%
rename from community/libraries/testing.md
rename to libraries/testing.md
index cb14368b..a4f9e58e 100644
--- a/community/libraries/testing.md
+++ b/libraries/testing.md
@@ -1,5 +1,5 @@
 ---
-layout: community
+layout: libraries
 title: Testing frameworks
 ---