diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 4c915d56..8266ab3a 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -1,10 +1,10 @@
     <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.4/TweenMax.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/latest/plugins/ScrollToPlugin.min.js"></script>
-    <script src="{{ .Site.BaseURL }}js/jquery-1.12.3.min.js"></script>
-    <script src="{{ .Site.BaseURL }}js/bootstrap.min.js"></script>
-    <script src="{{ .Site.BaseURL }}js/hugo-academic.js"></script>
+    <script src="{{ "/js/jquery-1.12.3.min.js" | relURL }}"></script>
+    <script src="{{ "/js/bootstrap.min.js" | relURL }}"></script>
+    <script src="{{ "/js/hugo-academic.js" | relURL }}"></script>
     {{ range .Site.Params.custom_js }}
-    <script src="{{ $.Site.BaseURL }}js/{{ . }}"></script>
+    <script src="{{ "/js/" | relURL }}{{ . }}"></script>
     {{ end }}
 
     {{ with .Site.GoogleAnalytics }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index fee73af7..a651e6d8 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -10,20 +10,20 @@
   {{ with .Site.Params.name }}<meta name="author" content="{{ . }}">{{ end }}
   {{ with .Site.Params.role }}<meta name="description" content="{{ . }}">{{ end }}
 
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/highlight.min.css">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/bootstrap.min.css">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/font-awesome.min.css">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/academicons.min.css">
+  <link rel="stylesheet" href="{{ "/css/highlight.min.css" | relURL }}">
+  <link rel="stylesheet" href="{{ "/css/bootstrap.min.css" | relURL }}">
+  <link rel="stylesheet" href="{{ "/css/font-awesome.min.css" | relURL }}">
+  <link rel="stylesheet" href="{{ "/css/academicons.min.css" | relURL }}">
   <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:400,700|Merriweather|Roboto+Mono">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/hugo-academic.css">
+  <link rel="stylesheet" href="{{ "/css/hugo-academic.css" | relURL }}">
   {{ range .Site.Params.custom_css }}
-  <link rel="stylesheet" href="{{ $.Site.BaseURL }}css/{{ . }}">
+  <link rel="stylesheet" href="{{ "/css/" | relURL }}{{ . }}">
   {{ end }}
 
   <link rel="alternate" href="{{ .RSSLink | default .Site.RSSLink  }}" type="application/rss+xml" title="{{ .Site.Title }}">
   <link rel="feed" href="{{ .RSSLink | default .Site.RSSLink }}" type="application/rss+xml" title="{{ .Site.Title }}">
 
-  <link rel="shortcut icon" href="{{ .Site.BaseURL }}img/favicon.ico" type="image/x-icon">
+  <link rel="shortcut icon" href="{{ "/img/favicon.ico" | relURL }}" type="image/x-icon">
   <link rel="canonical" href="{{ .Permalink }}">
 
   <title>{{ if not .IsHome }}{{ .Title }} | {{ end }}{{ .Site.Title }}</title>
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html
index 90201b25..b8911239 100644
--- a/layouts/partials/navbar.html
+++ b/layouts/partials/navbar.html
@@ -1,4 +1,3 @@
-{{ $baseUrl := .Site.BaseURL }}
 <nav class="navbar navbar-default navbar-fixed-top" id="navbar-main">
   <div class="container">
 
@@ -11,7 +10,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{ $baseUrl }}">{{ .Site.Title }}</a>
+      <a class="navbar-brand" href="{{ "/" | relURL }}">{{ .Site.Title }}</a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -20,7 +19,7 @@
       <!-- Left Nav Bar -->
       <ul class="nav navbar-nav navbar-right">
         {{ range .Site.Menus.main }}
-        <li class="nav-item"><a href="{{ $baseUrl }}{{ .URL }}">{{ .Name }}</a></li>
+        <li class="nav-item"><a href="{{ .URL | relURL }}">{{ .Name }}</a></li>
         {{ end }}
       </ul>