diff --git a/_includes/navbar.html b/_includes/navbar.html
index 0f82958..13e7e58 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -51,13 +51,14 @@
 	{% comment %} Show setup instructions, reference guide, and lesson episodes for lessons. {% endcomment %}
         {% if site.kind == "lesson" %}
         <li><a href="{{ page.root }}/setup/{{ site.index }}">Setup</a></li>
-        <li><a href="{{ page.root }}/reference/{{ site.index }}">Reference</a></li>
         <li class="dropdown">
           <a href="{{ page.root }}/{{ site.index }}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Episodes <span class="caret"></span></a>
           <ul class="dropdown-menu">
             {% for episode in site.episodes %}
             <li><a href="{{ page.root }}{{ episode.url }}{{ site.index }}">{{ episode.title }}</a></li>
             {% endfor %}
+	    <li role="separator" class="divider"></li>
+            <li><a href="{{ page.root }}/aio/{{ site.index }}">All in one page (Beta)</a></li>
           </ul>
         </li>
 	{% endif %}
@@ -67,6 +68,7 @@
         <li class="dropdown">
           <a href="{{ page.root }}/{{ site.index }}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Extras <span class="caret"></span></a>
           <ul class="dropdown-menu">
+	    <li><a href="{{ page.root }}/reference/{{ site.index }}">Reference</a></li>
             {% for extra in site.extras %}
             <li><a href="{{ page.root }}{{ extra.url }}{{ site.index }}">{{ extra.title }}</a></li>
             {% endfor %}
@@ -76,6 +78,13 @@
 
 	{% comment %} Always show license. {% endcomment %}
         <li><a href="{{ page.root }}/license/{{ site.index }}">License</a></li>
+	{% if page.source %}
+	{% if page.source == "Rmd" %}
+	<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path|replace: "_episodes", "_episodes_rmd" | replace: ".md", ".Rmd"}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>
+	{% endif %}
+	{% else %}
+	<li><a href="{{site.github.repository_url}}/edit/gh-pages/{{page.path}}">Improve this page <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a></li>
+	{% endif %}
       </ul>
       <form class="navbar-form navbar-right" role="search" id="search" onsubmit="google_search(); return false;">
         <div class="form-group">