diff --git a/404.md b/404.md
index 6d4039fb..ab9ba1d6 100644
--- a/404.md
+++ b/404.md
@@ -1,6 +1,7 @@
 ---
 layout: single
 title: Page Not Found
+permalink: 404.html
 ---
 
 We couldn't find what you were looking for.
diff --git a/Gemfile.lock b/Gemfile.lock
index e2d31911..bd775465 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,9 +2,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     colorator (0.1)
-    ffi (1.9.10)
-    ffi (1.9.10-x64-mingw32)
-    jekyll (3.1.3)
+    ffi (1.9.14)
+    ffi (1.9.14-x64-mingw32)
+    jekyll (3.1.6)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -14,39 +14,41 @@ GEM
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.10.0)
+    jekyll-redirect-from (0.11.0)
       jekyll (>= 2.0)
     jekyll-sass-converter (1.4.0)
       sass (~> 3.4)
-    jekyll-watch (1.3.1)
-      listen (~> 3.0)
-    json (1.8.3)
-    kramdown (1.10.0)
+    jekyll-watch (1.4.0)
+      listen (~> 3.0, < 3.1)
+    json (2.0.1)
+    kramdown (1.11.1)
     liquid (3.0.6)
-    listen (3.1.1)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
-    mini_portile2 (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    nokogiri (1.6.7.2-x64-mingw32)
-      mini_portile2 (~> 2.0.0.rc2)
+    mini_portile2 (2.1.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    nokogiri (1.6.8-x64-mingw32)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
     posix-spawn (0.3.11)
     pygments.rb (0.6.3)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.2.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     redcarpet (3.3.4)
-    rouge (1.10.1)
+    rouge (1.11.1)
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
     sass (3.4.22)
-    wdm (0.1.1)
     yajl-ruby (1.2.1)
 
 PLATFORMS
@@ -63,7 +65,6 @@ DEPENDENCIES
   rb-fsevent
   redcarpet
   sanitize (~> 2.0)
-  wdm (>= 0.1.0)
 
 BUNDLED WITH
    1.11.2
diff --git a/_config.yml b/_config.yml
index 2a46105a..4571003a 100644
--- a/_config.yml
+++ b/_config.yml
@@ -14,11 +14,28 @@ defaults:
     type: posts
   values:
     layout: post
+    sectionid: blog
+- scope:
+    path: blog
+    type: pages
+  values:
+    sectionid: blog
 - scope:
     path: docs
     type: pages
   values:
     layout: docs
+    sectionid: docs
+- scope:
+    path: tips
+    type: pages
+  values:
+    sectionid: docs
+- scope:
+    path: contributing
+    type: pages
+  values:
+    sectionid: docs
 exclude:
 - Gemfile
 - Gemfile.lock
diff --git a/_layouts/default.html b/_layouts/default.html
index 82659d8f..d42b8b15 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -50,10 +50,10 @@
           React
         </a>
         <ul class="nav-site nav-site-internal">
-          <li><a href="/react/docs/getting-started.html"{% if layout.sectionid == 'docs' or layout.sectionid == 'tips' or layout.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
+          <li><a href="/react/docs/getting-started.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' or page.sectionid == 'contributing' %} class="active"{% endif %}>Docs</a></li>
           <li><a href="/react/support.html"{% if page.id == 'support' %} class="active"{% endif %}>Support</a></li>
           <li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>Download</a></li>
-          <li><a href="/react/blog/"{% if layout.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
+          <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>Blog</a></li>
           <li>
             <input id="algolia-doc-search" type="text" placeholder="Search docs..." />
           </li>
diff --git a/acknowledgements.md b/acknowledgements.md
index cb1cd3e6..19894764 100644
--- a/acknowledgements.md
+++ b/acknowledgements.md
@@ -2,6 +2,7 @@
 id: acknowledgements
 title: Acknowledgements
 layout: single
+permalink: acknowledgements.html
 ---
 
 We'd like to thank all of our contributors:
diff --git a/contributing/design-principles.md b/contributing/design-principles.md
index 223061cb..3027aa2a 100644
--- a/contributing/design-principles.md
+++ b/contributing/design-principles.md
@@ -2,7 +2,7 @@
 id: design-principles
 title: Design Principles
 layout: contributing
-permalink: design-principles.html
+permalink: contributing/design-principles.html
 ---
 
 After using React in a couple of applications, you might be interested in contributing to React. Before [diving into specifics](https://github.com/facebook/react/blob/master/CONTRIBUTING.md), we think it's important to establish a few design principles guiding our decisions about changes in React.
diff --git a/docs/01-why-react.ru-RU.md b/docs/01-why-react.ru-RU.md
index 9891840c..663552b7 100644
--- a/docs/01-why-react.ru-RU.md
+++ b/docs/01-why-react.ru-RU.md
@@ -1,7 +1,7 @@
 ---
 id: why-react-ru-RU
 title: Почему именно React?
-permalink: why-react-ru-RU.html
+permalink: docs/why-react-ru-RU.html
 next: displaying-data-ru-RU.html
 ---
 React — библиотека JavaScript для создания интерфейсов от команд Facebook и Instagram. Многие ассоциируют React с понятием **View** в паттерне **[MVC](https://ru.wikipedia.org/wiki/Model-View-Controller)**.
diff --git a/docs/01-why-react.zh-TW.md b/docs/01-why-react.zh-TW.md
index 6e8005e8..34cf9493 100644
--- a/docs/01-why-react.zh-TW.md
+++ b/docs/01-why-react.zh-TW.md
@@ -1,7 +1,7 @@
 ---
 id: why-react-zh-TW
 title: Why React?
-permalink: why-react-zh-TW.html
+permalink: docs/why-react-zh-TW.html
 next: displaying-data.html
 ---
 React是Facebook和Instagram用來建立使用者介面的JavaScript函式庫. 很多人認為React就是處理 **[MVC](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93controller)**架構中 **V** 的部份.
diff --git a/docs/02-displaying-data.ru-RU.md b/docs/02-displaying-data.ru-RU.md
index ecdadd09..df4eb11e 100644
--- a/docs/02-displaying-data.ru-RU.md
+++ b/docs/02-displaying-data.ru-RU.md
@@ -1,7 +1,7 @@
 ---
 id: displaying-data-ru-RU
 title: Отображение данных
-permalink: displaying-data-ru-RU.html
+permalink: docs/displaying-data-ru-RU.html
 prev: why-react-ru-RU.html
 next: jsx-in-depth.html
 ---
diff --git a/docs/03-interactivity-and-dynamic-uis.ru-RU.md b/docs/03-interactivity-and-dynamic-uis.ru-RU.md
index f63425b1..def42b0b 100644
--- a/docs/03-interactivity-and-dynamic-uis.ru-RU.md
+++ b/docs/03-interactivity-and-dynamic-uis.ru-RU.md
@@ -1,7 +1,7 @@
 ---
 id: interactivity-and-dynamic-uis-ru-RU
 title: Интерактивные и динамические интерфейсы
-permalink: interactivity-and-dynamic-uis-ru-RU.html
+permalink: docs/interactivity-and-dynamic-uis-ru-RU.html
 prev: jsx-gotchas.html
 next: multiple-components.html
 ---
diff --git a/docs/error-decoder.md b/docs/error-decoder.md
index 76d13b39..8623bf5e 100644
--- a/docs/error-decoder.md
+++ b/docs/error-decoder.md
@@ -1,7 +1,7 @@
 ---
 id: error-decoder
 title: Error Decoder
-permalink: error-decoder.html
+permalink: docs/error-decoder.html
 ---
 
 In the minified production build of React, we avoid sending down full error messages in order to reduce the number of bytes sent over the wire.
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 39fbd0a5..10d0b761 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -1,6 +1,7 @@
 ---
 id: getting-started
 title: Getting Started
+permalink: docs/getting-started.html
 next: tutorial.html
 redirect_from: "docs/index.html"
 ---
diff --git a/docs/thinking-in-react.it-IT.md b/docs/thinking-in-react.it-IT.md
index 7cc96b61..3c65c63c 100644
--- a/docs/thinking-in-react.it-IT.md
+++ b/docs/thinking-in-react.it-IT.md
@@ -1,6 +1,7 @@
 ---
 id: thinking-in-react-it-IT
 title: Pensare in React
+permalink: docs/thinking-in-react-it-IT.html
 prev: tutorial-it-IT.html
 next: conferences-it-IT.html
 redirect_from: 'blog/2013/11/05/thinking-in-react.html'
diff --git a/docs/thinking-in-react.ja-JP.md b/docs/thinking-in-react.ja-JP.md
index ee1768a7..0eb69e6c 100644
--- a/docs/thinking-in-react.ja-JP.md
+++ b/docs/thinking-in-react.ja-JP.md
@@ -1,6 +1,7 @@
 ---
 id: thinking-in-react-ja-JP
 title: Reactの考え方
+permalink: docs/thinking-in-react-ja-JP.html
 prev: tutorial-ja-JP.html
 next: conferences.html
 redirect_from: 'blog/2013/11/05/thinking-in-react.html'
diff --git a/docs/thinking-in-react.md b/docs/thinking-in-react.md
index 811bfc99..187ba37c 100644
--- a/docs/thinking-in-react.md
+++ b/docs/thinking-in-react.md
@@ -1,6 +1,7 @@
 ---
 id: thinking-in-react
 title: Thinking in React
+permalink: docs/thinking-in-react.html
 prev: tutorial.html
 next: conferences.html
 redirect_from: 'blog/2013/11/05/thinking-in-react.html'
diff --git a/docs/thinking-in-react.zh-CN.md b/docs/thinking-in-react.zh-CN.md
index 574983d0..59f72257 100644
--- a/docs/thinking-in-react.zh-CN.md
+++ b/docs/thinking-in-react.zh-CN.md
@@ -1,7 +1,7 @@
 ---
 id: thinking-in-react-zh-CN
 title: React 编程思想
-permalink: thinking-in-react-zh-CN.html
+permalink: docs/thinking-in-react-zh-CN.html
 prev: tutorial-zh-CN.html
 next: conferences-zh-CN.html
 redirect_from: 'blog/2013/11/05/thinking-in-react.html'
diff --git a/docs/tutorial.it-IT.md b/docs/tutorial.it-IT.md
index 860da401..9eec9964 100755
--- a/docs/tutorial.it-IT.md
+++ b/docs/tutorial.it-IT.md
@@ -1,6 +1,7 @@
 ---
 id: tutorial-it-IT
 title: Tutorial
+permalink: docs/tutorial-it-IT.html
 prev: getting-started-it-IT.html
 next: thinking-in-react-it-IT.html
 ---
diff --git a/docs/tutorial.md b/docs/tutorial.md
index 1ec10536..f6f96041 100755
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -1,6 +1,7 @@
 ---
 id: tutorial
 title: Tutorial
+permalink: docs/tutorial.html
 prev: getting-started.html
 next: thinking-in-react.html
 ---
diff --git a/docs/tutorial.zh-CN.md b/docs/tutorial.zh-CN.md
index 02c108cc..0b9e94a5 100755
--- a/docs/tutorial.zh-CN.md
+++ b/docs/tutorial.zh-CN.md
@@ -1,7 +1,7 @@
 ---
 id: tutorial-zh-CN
 title: 教程
-permalink: tutorial-zh-CN.html
+permalink: docs/tutorial-zh-CN.html
 prev: getting-started-zh-CN.html
 next: thinking-in-react-zh-CN.html
 ---
diff --git a/downloads.md b/downloads.md
index 7a89c59d..55edc964 100644
--- a/downloads.md
+++ b/downloads.md
@@ -2,6 +2,7 @@
 id: downloads
 title: Downloads
 layout: single
+permalink: downloads.html
 ---
 Download the starter kit to get everything you need to
 [get started with React](/react/docs/getting-started.html). The starter kit includes React and some simple example apps.
diff --git a/feed.xml b/feed.xml
index ddd764e3..0d9c1e65 100644
--- a/feed.xml
+++ b/feed.xml
@@ -1,5 +1,4 @@
 ---
-layout: none
 ---
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
diff --git a/jsx-compiler.md b/jsx-compiler.md
index bcfa6430..85e9775f 100644
--- a/jsx-compiler.md
+++ b/jsx-compiler.md
@@ -1,6 +1,7 @@
 ---
 layout: single
 title: JSX Compiler Service
+permalink: jsx-compiler.html
 id: jsx-compiler
 ---
 
diff --git a/support.md b/support.md
index 49154559..88fe106c 100644
--- a/support.md
+++ b/support.md
@@ -2,6 +2,7 @@
 title: Need help?
 layout: single
 id: support
+permalink: support.html
 ---
 
 **React** is worked on full-time by Facebook's product infrastructure and Instagram's user interface engineering teams. They're often around and available for questions.
diff --git a/warnings/legacy-factories.md b/warnings/legacy-factories.md
index 3a240a1b..25fc5aaa 100644
--- a/warnings/legacy-factories.md
+++ b/warnings/legacy-factories.md
@@ -1,6 +1,7 @@
 ---
 title: React Element Factories and JSX Warning
 layout: single
+permalink: warnings/legacy-factories.html
 ---
 
 You probably came here because your code is calling your component as a plain function call. This is now deprecated:
diff --git a/warnings/refs-must-have-owner.md b/warnings/refs-must-have-owner.md
index 9d3bd00d..471a0699 100644
--- a/warnings/refs-must-have-owner.md
+++ b/warnings/refs-must-have-owner.md
@@ -1,6 +1,7 @@
 ---
 title: Refs Must Have Owner Warning
 layout: single
+permalink: warnings/refs-must-have-owner.html
 ---
 
 You are probably here because you got the following error messages:
diff --git a/warnings/special-props.md b/warnings/special-props.md
index d0260cc3..cdd6b265 100644
--- a/warnings/special-props.md
+++ b/warnings/special-props.md
@@ -1,6 +1,7 @@
 ---
 title: Special Props Warning
 layout: single
+permalink: warnings/special-props.html
 ---
 
 Most props on a JSX element are passed on to the component, however, there are two special props (`ref` and `key`) which are used by React, and are thus not forwarded to the component.
diff --git a/warnings/unknown-prop.md b/warnings/unknown-prop.md
index 959fa94f..9f030a82 100644
--- a/warnings/unknown-prop.md
+++ b/warnings/unknown-prop.md
@@ -1,6 +1,7 @@
 ---
 title: Unknown Prop Warning
 layout: single
+permalink: warnings/unknown-prop.html
 ---
 The unknown-prop warning will fire if you attempt to render a DOM element with a prop that is not recognized by React as a legal DOM attribute/property. You should ensure that your DOM elements do not have spurious props floating around.