diff --git a/404.html b/404.html
index 929fc57..0da4ee0 100644
--- a/404.html
+++ b/404.html
@@ -6,4 +6,4 @@ description: "Looks like there has been a mistake. Nothing exists here."
 redirect: true
 ---
 
-<p>You will be redirected to the main page within 3 seconds. If not redirected, please click <a href="{{ site.baseurl | prepend: site.url }}/">here</a>.</p>
+<p>You will be redirected to the main page within 3 seconds. If not redirected, please click <a href="{{ site.baseurl }}/">here</a>.</p>
diff --git a/_includes/header.html b/_includes/header.html
index 0bb0128..29bb66c 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -5,8 +5,20 @@
       <nav id="navbar" class="navbar navbar-light navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
         <div class="container">
           {% if page.permalink != '/' -%}
-          <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl | prepend: site.url }}/">
-              {%- if site.title == "blank" -%}<span class="font-weight-bold">{{ site.first_name }}</span> {{ site.middle_name }}  {{ site.last_name }}{%- else -%}{{ site.title }}{%- endif -%}
+          <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl }}/">
+            {%- if site.title == "blank" -%}
+              {%- if site.first_name -%}
+                <span class="font-weight-bold">{{- site.first_name -}}&nbsp;</span>
+              {%- endif -%}
+              {%- if site.middle_name -%}
+                {{- site.middle_name -}}&nbsp;
+              {%- endif -%}
+              {%- if site.last_name -%}
+                {{- site.last_name -}}
+              {%- endif -%}
+            {%- else -%}
+              {{- site.title -}}
+            {%- endif -%}
           </a>
           {%- elsif site.enable_navbar_social -%}
           <!-- Social Icons -->
diff --git a/_includes/social.html b/_includes/social.html
index 4ed62e1..1740326 100644
--- a/_includes/social.html
+++ b/_includes/social.html
@@ -53,5 +53,5 @@
             <a href="https://stackoverflow.com/users/{{ site.stackoverflow_id }}" title="Stackoverflow"><i class="fab fa-stack-overflow"></i></a>
             {% endif %}
             {%- if site.rss_icon -%}
-            <a href="{{ site.baseurl | prepend: site.url }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
-            {% endif %}
\ No newline at end of file
+            <a href="{{ site.baseurl }}/feed.xml" title="RSS Feed"><i class="fas fa-rss-square"></i></a>
+            {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index 669729f..1d291e4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,7 +4,7 @@
   <!-- Head -->
   <head>
   {%- if page.redirect -%}
-    <meta http-equiv="refresh" content="3; url={{ site.baseurl | prepend: site.url }}/" />
+    <meta http-equiv="refresh" content="3; url={{ site.baseurl }}/" />
   {%- endif -%}
   {% include head.html %}
   </head>
