diff --git a/config.php b/config.php
index a842c68..08dfe4d 100644
--- a/config.php
+++ b/config.php
@@ -14,7 +14,7 @@ return [
     },
 
     'link' => function ($page, $path) {
-        return $page->baseUrl . $page->version() . '/' . $path . ($page->prettyUrls ? '' : '.html');
+        return $page->baseUrl . '/' . $page->version() . '/' . $path . ($page->prettyUrls ? '' : '.html');
     },
 
     // Algolia DocSearch credentials
diff --git a/config.production.php b/config.production.php
index ed868c8..894bbc4 100644
--- a/config.production.php
+++ b/config.production.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'baseUrl'    => env('JIGSAW_BASE_URL') ?? 'https://tenancy.samuelstancl.me/docs/', // must end with /
+    'baseUrl'    => env('JIGSAW_BASE_URL') ?? 'https://tenancy.samuelstancl.me/docs',
     'production' => true,
 
     'docsearchApiKey' => '53c5eaf88e819535d98f4a179c1802e1',
diff --git a/source/_layouts/master.blade.php b/source/_layouts/master.blade.php
index 743fba6..ba25a88 100644
--- a/source/_layouts/master.blade.php
+++ b/source/_layouts/master.blade.php
@@ -60,9 +60,9 @@
                     <select id="versionSelect">
                         @foreach($page->navigation as $version => $_)
                             <option 
-                                value="{{ $page->baseUrl . $version }}"
-                                @if($page->version() === $version) {{-- todo, doesn't work --}}
-                                    'checked'
+                                value="/{{ $page->baseUrl . $version }}"
+                                @if($page->version() === $version)
+                                    selected
                                 @endif
                             >
                                 {{ $version }}
diff --git a/source/index.blade.php b/source/index.blade.php
index 2facec7..f837574 100644
--- a/source/index.blade.php
+++ b/source/index.blade.php
@@ -2,7 +2,7 @@
 <html lang="en-US">
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="refresh" content="0; url={{ $page->baseUrl . $page->defaultVersion }}">
+    <meta http-equiv="refresh" content="0; url={{ $page->baseUrl . '/' . $page->defaultVersion }}">
     <title>stancl/tenancy</title>
 </head>
 </html>
\ No newline at end of file
