diff --git a/docs/_includes/edit_button.html b/docs/_includes/edit_button.html
index 801ef54442..c01e84d97b 100644
--- a/docs/_includes/edit_button.html
+++ b/docs/_includes/edit_button.html
@@ -1,9 +1,8 @@
-{% assign pagePath = page.inputPath | replace: "./", "" %}
 <a
   data-toggle="tooltip"
   data-placement="top"
   title="Edit this on Github"
   class="icon-edit"
-  href="{{ site.github.repository_url }}/edit/master/docs/{{ pagePath }}"
+  href="{{ site.github.repository_url }}/edit/master/docs/{{ page.inputPath | formatInputPath }}"
   target="_blank"
 ></a>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 63670b0804..34028984b9 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -69,12 +69,14 @@
 
         <div class="container">
 
-          <h1 class="margin-bottom-none">{{ title }}</h1>
-          {% if edit != false %}
-            <span class="h1 margin-bottom-none">
+          <h1 class="margin-bottom-none">{{ title }}
+
+            {% if edit != false %}
+            <span>
               {% include edit_button.html %}
             </span>
-          {% endif %}
+            {% endif %}
+          </h1>
           {% if sub_title %}
             <h4>{{ sub_title}}</h4>
           {% endif %}
diff --git a/docs/eleventy.config.js b/docs/eleventy.config.js
index 3ff0e68e26..cacf3a56fb 100644
--- a/docs/eleventy.config.js
+++ b/docs/eleventy.config.js
@@ -18,7 +18,9 @@ module.exports = eleventyConfig => {
   eleventyConfig.addGlobalData('permalink', '/{{ page.filePathStem }}.html');
 
   eleventyConfig.addCollection('guides', collectionApi => {
-    return collectionApi.getFilteredByTag('guides').sort((a, b) => a.data.index - b.data.index);
+    return collectionApi
+        .getFilteredByTag('guides')
+        .sort((a, b) => a.data.index - b.data.index);
   });
 
   eleventyConfig.addCollection('pages', collectionApi => {
@@ -43,6 +45,10 @@ module.exports = eleventyConfig => {
         .sort((a, b) => b.date - a.date || b.inputPath.localeCompare(a.inputPath));
   });
 
+  eleventyConfig.addFilter("formatInputPath", function(value) {
+    return value.replace("./", "").replace("_guides", "guides").replace("_posts", "post");
+  });
+
   eleventyConfig.addFilter('first_paragraph', function(content) {
     const marker = '</p>';
     const idx = content.indexOf(marker);