4 files changed, 6 insertions, 6 deletions
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 242c4f3..3f58ad4 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,7 +5,7 @@
 {{ if .Site.Params.useLargeHeaderDesign }}
 <div class="header header--large">
   <div class="contain contain--more center">
-    <a href="/" class="header__logo">
+    <a href="{{ .Site.BaseURL }}" class="header__logo">
       {{ if .Site.Params.useLogo }}
         <img src="{{ .Site.Params.logo }}" alt="{{ .Site.Title }}">
           {{ else }}
@@ -17,7 +17,7 @@
 {{ else }}
 <div class="header">
   <div class="contain">
-    <a href="/" class="header__logo header__logo--small">
+    <a href="{{ .Site.BaseURL }}" class="header__logo header__logo--small">
       {{ if .Site.Params.useLogo }}
         <img src="{{ .Site.Params.logo }}" alt="{{ .Site.Title }}">
           {{ else }}
diff --git a/layouts/partials/index/announcements.html b/layouts/partials/index/announcements.html
index b629655..060c049 100644
--- a/layouts/partials/index/announcements.html
+++ b/layouts/partials/index/announcements.html
@@ -6,12 +6,12 @@
     {{ range $active }}
       <div class="padding">
         <p>
-          <a href="{{ .Permalink }}"><strong class="bold">{{ .Title }} →</strong></a>
+          <a href="{{ .RelPermalink }}"><strong class="bold">{{ .Title }} →</strong></a>
         </p>
 
         <p><small>
           {{ range .Params.Affected }}
-            <a href="/affected/{{ . | urlize }}/" class="tag no-underline">{{ . }}</a>
+            <a href="affected/{{ . | urlize }}/" class="tag no-underline">{{ . }}</a>
           {{ end }}
         </small></p>
 
diff --git a/layouts/partials/index/components.html b/layouts/partials/index/components.html
index c45cee2..ff5174f 100644
--- a/layouts/partials/index/components.html
+++ b/layouts/partials/index/components.html
@@ -59,7 +59,7 @@
         {{ $thisIsDown := where $activeComponentIssues "Params.severity" "=" "down" }}
 
         <div class="component" data-status="{{ if $thisIsDown }}down{{ else }}{{ if $thisIsDisrupted }}disrupted{{ else }}{{ if $thisIsNotice }}notice{{ else }}ok{{ end }}{{ end }}{{ end }}">
-          <a href="/affected/{{ .name | urlize }}/" class="no-underline">
+          <a href="affected/{{ .name | urlize }}/" class="no-underline">
             {{ default .name .displayName }}
           </a>
 
diff --git a/layouts/partials/index/tabs.html b/layouts/partials/index/tabs.html
index 9544890..477cacb 100644
--- a/layouts/partials/index/tabs.html
+++ b/layouts/partials/index/tabs.html
@@ -1,7 +1,7 @@
 {{ if .Site.Params.customTabs }}
   <div class="tabs">
     <div class="contain tabs--inner">
-      <a href="/#incidents" class="tab tab--current">
+      <a href="#incidents" class="tab tab--current">
         {{ T "incidents" }}
       </a>