diff --git a/_config.yml b/_config.yml
index 569dede..3045b55 100644
--- a/_config.yml
+++ b/_config.yml
@@ -17,7 +17,7 @@ title: Sleep as Android
 email: info@urbandroid.org
 description: >- # this means to ignore newlines until "baseurl:"
   Documentation site for Sleep as Android (a sleep tracking, sleep cycle Android app)
-baseurl: "/" # the subpath of your site, e.g. /blog
+baseurl: "/docs" # the subpath of your site, e.g. /blog
 url: "http://localhost:4000" # the base hostname & protocol for your site, e.g. http://example.com
 twitter_username: UrbandroidTeam
 
@@ -54,7 +54,7 @@ asciidoctor:
   template_dir: _templates
   attributes:
     xrefstyle: full
-    imagesdir: /assets/images
+    imagesdir: assets/images
     iconsdir: '{imagesdir}/../icons'
     hardbreaks: true
     icons: ''
diff --git a/_includes/head.html b/_includes/head.html
index e5ea5e9..185f089 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -19,8 +19,8 @@
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
 
   {% assign cacheBust = site.time | date:'?v=%s' %}
-  <link rel="stylesheet" href="{{ "/assets/css/just-the-docs.css" | relative_url | append: cacheBust }}">
-  <link rel="stylesheet" href="{{ "/assets/css/style.css" | relative_url | append: cacheBust }}">
+  <link rel="stylesheet" href="{{ "assets/css/just-the-docs.css" | relative_url | append: cacheBust }}">
+  <link rel="stylesheet" href="{{ "assets/css/style.css" | relative_url | append: cacheBust }}">
 
   <!-- Global site tag (gtag.js) - Google Analytics -->
   <script async src="https://www.googletagmanager.com/gtag/js?id=UA-78796802-5"></script>
diff --git a/_layouts/home.html b/_layouts/home.html
index 6971dfa..62af8af 100644
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -8,7 +8,7 @@ <h1>Sleep as Android<br>user manual</h1>
   <div class="sectionbody">
     <div class="imageblock text-center">
       <div class="content">
-        <img src="/assets/images/logo.png" alt="logo" width="50%">
+        <img src="assets/images/logo.png" alt="logo" width="50%">
       </div>
     </div>
   </div>
diff --git a/_plugins/liquid-filters/generate-nav.rb b/_plugins/liquid-filters/generate-nav.rb
index 5df967b..7f4d575 100644
--- a/_plugins/liquid-filters/generate-nav.rb
+++ b/_plugins/liquid-filters/generate-nav.rb
@@ -28,7 +28,7 @@ def generateList(partialTree)
         ul_contents = ""
 
         active = isPageOrChildrenActive(partialTree)
-        url = '<a class="navigation-list-link ' + (active ? 'active' : '') + '" href="' + partialTree[:url].to_s + '">' + partialTree[:title].to_s + '</a>'
+        url = '<a class="navigation-list-link ' + (active ? 'active' : '') + '" href="' + Jekyll.sites.first.baseurl + partialTree[:url].to_s + '">' + partialTree[:title].to_s + '</a>'
 
         ul_contents << createTag(:li, ['navigation-list-item', active], url)
         if partialTree[:children] && active
diff --git a/deploy.yml b/deploy.yml
index 0b3915b..d7a1384 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -1,2 +1,2 @@
-url: "https://docs.sleep.urbandroid.org" # the base hostname & protocol for your site, e.g. http://example.com
+url: "https://sleep.urbandroid.org" # the base hostname & protocol for your site, e.g. http://example.com
 debug: false