diff --git a/material/base.html b/material/base.html
index d14b3ecaf..ebfcceca5 100644
--- a/material/base.html
+++ b/material/base.html
@@ -108,10 +108,10 @@
           {% endblock %}
           <div class="md-content">
             <article class="md-content__inner md-typeset">
-              {% if config.edit_uri %}
-                <a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-icon md-content__icon">edit</a>
-              {% endif %}
               {% block content %}
+                {% if config.edit_uri %}
+                  <a href="{{ page.edit_url }}" title="{{ lang.t('edit.link.title') }}" class="md-icon md-content__icon">edit</a>
+                {% endif %}
                 {% if page.meta.source %}
                   <a href="{{ page.edit_url }}" title="{{ lang.t('source.link.title') }}" class="md-icon md-content__icon">folder_open</a>
                 {% endif %}
diff --git a/mkdocs.yml b/mkdocs.yml
index 3ae1377d2..c42754366 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -27,7 +27,7 @@ site_url: http://squidfunk.github.io/mkdocs-material/
 # Repository
 repo_name: squidfunk/mkdocs-material
 repo_url: https://github.com/squidfunk/mkdocs-material
-edit_uri: tree/master/docs
+#edit_uri: tree/master/docs
 
 # Copyright
 copyright: 'Copyright &copy; 2016 - 2017 Martin Donath'
@@ -37,8 +37,8 @@ theme_dir: material
 
 # Options
 extra:
-  feature:
-    tabs: true
+  #feature:
+  #  tabs: true
   palette:
     primary: indigo
     accent: indigo
diff --git a/src/base.html b/src/base.html
index 41e7f0a00..7b9ea8fdf 100644
--- a/src/base.html
+++ b/src/base.html
@@ -210,16 +210,16 @@
           <div class="md-content">
             <article class="md-content__inner md-typeset">
 
-              <!-- Edit button, if URL was defined -->
-              {% if config.edit_uri %}
-                <a href="{{ page.edit_url }}"
-                    title="{{ lang.t('edit.link.title') }}"
-                    class="md-icon md-content__icon">edit</a>
-              {% endif %}
-
               <!-- Block: content -->
               {% block content %}
 
+                <!-- Edit button, if URL was defined -->
+                {% if config.edit_uri %}
+                  <a href="{{ page.edit_url }}"
+                      title="{{ lang.t('edit.link.title') }}"
+                      class="md-icon md-content__icon">edit</a>
+                {% endif %}
+
                 <!-- Linked source files -->
                 {% if page.meta.source %}
                   <a href="{{ page.edit_url }}"