diff --git a/common/header.php b/common/header.php
index 04ef960..ca2bf3c 100644
--- a/common/header.php
+++ b/common/header.php
@@ -43,9 +43,17 @@
 <?php echo body_tag(array('id' => @$bodyid, 'class' => @$bodyclass)); ?>
     <?php fire_plugin_hook('public_body', array('view'=>$this)); ?>
     <header>
-      
-        <h1 id="site-title"><?php echo link_to_home_page(theme_logo(), array('alt' => 'Logo for Carleton Guide to Medieval Rome', 'title' => 'Logo for Carleton Guide to Medieval Rome')); ?></h1>
-            
+    
+        <h1 id="site-title">
+            <a href="<?php echo html_escape(url('/')); ?>" title="<?php echo html_escape(option('site_title')); ?>">
+                <?php if (theme_logo()): ?>
+                    <?php echo theme_logo(); ?>
+                <?php else: ?>
+                    <span class="site-title-fallback"><?php echo html_escape(option('site_title')); ?></span>
+                <?php endif; ?>
+            </a>
+        </h1>    
+
         <?php echo search_form(array( 'submit_value' => 'Search')); ?>
     
         
@@ -59,7 +67,16 @@
     <?php fire_plugin_hook('public_body', array('view'=>$this)); ?>
     <header>
     <div class="row">
-        <div class="column left"><h1 id="site-title"><?php echo link_to_home_page(theme_logo(), array('alt' => 'Logo for Carleton Guide to Medieval Rome', 'title' => 'Logo for Carleton Guide to Medieval Rome')); ?></h1>
+        <div class="column left">
+            <h1 id="site-title">
+            <a href="<?php echo html_escape(url('/')); ?>" title="<?php echo html_escape(option('site_title')); ?>">
+                    <?php if (theme_logo()): ?>
+                        <?php echo theme_logo(); ?>
+                    <?php else: ?>
+                        <span class="site-title-fallback"><?php echo html_escape(option('site_title')); ?></span>
+                    <?php endif; ?>
+                </a>
+            </h1>
         </div>
         <!-- this section of php is needed for header to work -->
         <!-- <div class="column middle"><nav id="navigation" data-role="none">
diff --git a/css/style.css b/css/style.css
index 22bc4f0..d6a899b 100644
--- a/css/style.css
+++ b/css/style.css
@@ -203,7 +203,6 @@
     position: relative;
     text-align: center;
   }
-
   #site-title {
     float: left;
     padding: 0 2.85714%;
@@ -215,7 +214,7 @@
   }
   
   #site-title a {
-    /* padding: 0.5625em 0; */
+    /*padding: 0.5625em 0; */
     display: block;
     color: #DAA41B;
     font-variant: small-caps;
@@ -225,7 +224,7 @@
   #site-title img {
     float: left;
     height: 1.5em;
-    /* width: fit-content; */
+    /*width: fit-content; */
     content: url("../images/CGMR_03.png");
     vertical-align: bottom;
     opacity: 100;
@@ -2573,3 +2572,51 @@
 
   /* @end */
 }
+
+body:not(.home) #site-title {
+  position: absolute;
+  top: 18px;
+  left: 8px;
+  right: auto;
+
+  width: 210px;
+  max-width: 210px;
+
+  margin: 0;
+  padding: 0;
+  z-index: 80;
+  text-align: left;
+  float: none;
+
+  overflow: visible;
+}
+
+body:not(.home) #site-title > a {
+  display: block;
+  width: 100%;
+  text-decoration: none;
+  overflow: visible;
+}
+
+body:not(.home) #site-title .site-title-fallback {
+  display: block;
+  width: 100%;
+
+  font-size: 22px;
+  line-height: 1.15;
+  font-weight: 600;
+  color: #DAA41B;
+
+  text-align: left;
+  white-space: normal;
+  overflow-wrap: normal;
+  word-break: normal;
+
+  overflow: visible;
+}
+
+body:not(.home) #navigation {
+  left: 0;
+  padding-left: 235px;
+  padding-right: 3.2%;
+}
\ No newline at end of file