diff --git a/config.php b/config.php
index c283eae..ceb18ff 100644
--- a/config.php
+++ b/config.php
@@ -8,7 +8,8 @@ return [
     'siteName'        => 'Tenancy for Laravel',
     'siteDescription' => 'Automatically turn any Laravel application multi-tenant — no code changes needed. stancl/tenancy automatically switches database connections and all other things in the background, letting you leverage standard Laravel code into a full SaaS application. Most features out of all multi-tenancy packages. Single & multi-database tenancy.',
 
-    'githubUrl' => 'https://github.com/stancl/tenancy',
+    'githubUrl'     => 'https://github.com/stancl/tenancy',
+    'githubDocsUrl' => 'https://github.com/stancl/tenancy-docs',
 
     // key => display name
     'versions' => [
@@ -27,6 +28,10 @@ return [
         return $page->baseUrl . '/docs/' . $page->version() . '/' . $path . ($page->prettyUrls ? '' : '.html');
     },
 
+    'editLink' => function ($page) {
+        return "{$page->githubDocsUrl}/edit/master/source/{$page->getRelativePath()}/{$page->getFilename()}.{$page->getExtension()}";
+    },
+
     // Algolia DocSearch credentials
     'docsearchApiKey' => '53c5eaf88e819535d98f4a179c1802e1',
     'docsearchIndexName' => 'stancl-tenancy',
diff --git a/source/_layouts/documentation.blade.php b/source/_layouts/documentation.blade.php
index 285600b..a251dcc 100644
--- a/source/_layouts/documentation.blade.php
+++ b/source/_layouts/documentation.blade.php
@@ -72,15 +72,30 @@
                         <nav id="js-nav-menu" class="nav-menu md:block md:col-span-2 hidden col-span-8 font-semibold text-indigo-700">
                             @include('_nav.menu', ['items' => $page->navigation[$page->version()]])
                         </nav>
-                        <div class="markdown lg:pl-4 md:col-span-6 lg:col-span-4 col-span-8 pb-16 break-words" v-pre>
-                            @if($page->version() !== $page->defaultVersion)
-                                <div class="bg-yellow-50 border border-yellow-100 text-yellow-800 w-full px-4 py-3 rounded-lg">
-                                    You're looking at {{ $page->version() }} documentation. The current version is {{ $page->defaultVersion }}.
-                                    You can find the docs for the current version <a href="/docs/{{ $page->defaultVersion }}">here</a>.
-                                </div>
-                            @endif
+                        <div class="lg:pl-4 md:col-span-6 lg:col-span-4 col-span-8 pb-16 break-words" v-pre>
+                            <div class="markdown">
+                                @if($page->version() !== $page->defaultVersion)
+                                    <div class="bg-yellow-50 border border-yellow-100 text-yellow-800 w-full px-4 py-3 rounded-lg">
+                                        You're looking at {{ $page->version() }} documentation. The current version is {{ $page->defaultVersion }}.
+                                        You can find the docs for the current version <a href="/docs/{{ $page->defaultVersion }}">here</a>.
+                                    </div>
+                                @endif
 
-                            @yield('content')
+                                @yield('content')
+                            </div>
+                            <div class="flex justify-end">
+                                <a href="{{ $page->editLink() }}" data-turbolinks="false"
+                                   class="inline-flex text-base font-medium leading-6 hover:text-white text-gray-100 whitespace-no-wrap transition duration-150 ease-in-out">
+                                    <span class="inline-flex items-center justify-center px-4 py-2 bg-indigo-600 border border-transparent rounded-r-none rounded-md">
+                                        <svg class="w-6 h-6" fill="currentColor" viewBox="0 0 24 24">
+                                            <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd"></path>
+                                        </svg>
+                                    </span>
+                                    <span class="inline-flex items-center justify-center px-4 py-2 bg-gray-700 border border-transparent rounded-l-none rounded-md">
+                                        Edit on GitHub
+                                    </span>
+                                </a>
+                            </div>
                         </div>
                     </div>
                 </section>
@@ -97,4 +112,4 @@
         @stack('scripts')
 
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/source/_partials/testimonials.blade.php b/source/_partials/testimonials.blade.php
index 3d4a3fb..2a48321 100644
--- a/source/_partials/testimonials.blade.php
+++ b/source/_partials/testimonials.blade.php
@@ -14,7 +14,7 @@
         <footer class="mt-8">
           <div class="flex">
             <div class="flex-shrink-0 inline-flex rounded-full border-2 border-white">
-              <img class="h-12 w-12 rounded-full" src="https://media-exp1.licdn.com/dms/image/C5603AQEmispANTVYDA/profile-displayphoto-shrink_800_800/0?e=1596067200&v=beta&t=UO5qyQNEg6ZnEOtd7XeS7N_EOV7pQwGOcVmJzhHpdUg" alt="Jørgen Solli" />
+              <img class="h-12 w-12 rounded-full" src="https://media-exp1.licdn.com/dms/image/C5603AQEmispANTVYDA/profile-displayphoto-shrink_200_200/0?e=1600905600&v=beta&t=5D91f-juRO3AYIN-0qvGM1bUwg0PlwIDgG9bdol9Qwc" alt="Jørgen Solli" />
             </div>
             <div class="ml-4">
               <div class="text-base leading-6 font-medium text-gray-900">Jørgen Solli
diff --git a/source/docs/v3/features/universal-routes.blade.md b/source/docs/v3/features/universal-routes.blade.md
index 947a2ac..8169d3f 100644
--- a/source/docs/v3/features/universal-routes.blade.md
+++ b/source/docs/v3/features/universal-routes.blade.md
@@ -6,7 +6,7 @@ section: content
 
 # Universal Routes {#universal-routes}
 
-> Note: If you need custom [onFail]({{ $page->link('tenant-identification') }}) logic, you cannot use this feature as it will override any of your changes to that logic. Instead, look into the source code of this feature and make your onFail logic implement universal routes too.
+> Note: If you need custom [onFail]({{ $page->link('tenant-identification') }}) logic, you cannot use this feature as it will override any of your changes to that logic. Instead, look into the source code of this feature and make your onFail logic implement universal routes too. If you do this, make sure to disable this feature in the config file followed by a cache clear.
 
 Sometimes, you may want to use the exact same **route action** both in the central application and the tenant application. Note the emphasis on route **action** — you may use the same **path** with different actions in central & tenant routes, whereas this section covers using the same **route and action**.
 
diff --git a/source/index.blade.php b/source/index.blade.php
index 7316183..710bb6c 100644
--- a/source/index.blade.php
+++ b/source/index.blade.php
@@ -117,7 +117,7 @@ dispatch(new SendOrderCreatedMail);</pre>
         <div class="flex-shrink-0">
           <div class="flex items-center justify-center w-12 h-12 text-white bg-indigo-500 rounded-md">
             <svg class="w-6 h-6" stroke="currentColor" fill="none" viewBox="0 0 24 24">
-                      <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 14v6m-3-3h6M6 10h2a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v2a2 2 0 002 2zm10 0h2a2 2 0 002-2V6a2 2 0 00-2-2h-2a2 2 0 00-2 2v2a2 2 0 002 2zM6 20h2a2 2 0 002-2v-2a2 2 0 00-2-2H6a2 2 0 00-2 2v2a2 2 0 002 2z"></path>
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 14v6m-3-3h6M6 10h2a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v2a2 2 0 002 2zm10 0h2a2 2 0 002-2V6a2 2 0 00-2-2h-2a2 2 0 00-2 2v2a2 2 0 002 2zM6 20h2a2 2 0 002-2v-2a2 2 0 00-2-2H6a2 2 0 00-2 2v2a2 2 0 002 2z"></path>
           </svg>
         </div>
       </div>