diff --git a/themes/bootstrap3/templates/footer.phtml b/themes/bootstrap3/templates/footer.phtml
index 10b56fd14f6b8bcd822b989b81a3ed1871f253ca..dcd04d06b06b1a393ed54657989101021b9437a0 100644
--- a/themes/bootstrap3/templates/footer.phtml
+++ b/themes/bootstrap3/templates/footer.phtml
@@ -1,28 +1,32 @@
-<hr/>
-<div class="row">
-  <div class="col-sm-4">
-    <p><strong><?=$this->transEsc('Search Options')?></strong></p>
-    <ul>
-      <li><a href="<?=$this->url('search-history')?>"><?=$this->transEsc('Search History')?></a></li>
-      <li><a href="<?=$this->url('search-advanced')?>"><?=$this->transEsc('Advanced Search')?></a></li>
-    </ul>
+<footer class="hidden-print">
+  <div class="footer-container">
+    <div class="footer-column">
+      <p><strong><?=$this->transEsc('Search Options')?></strong></p>
+      <ul>
+        <li><a href="<?=$this->url('search-history')?>"><?=$this->transEsc('Search History')?></a></li>
+        <li><a href="<?=$this->url('search-advanced')?>"><?=$this->transEsc('Advanced Search')?></a></li>
+      </ul>
+    </div>
+    <div class="footer-column">
+      <p><strong><?=$this->transEsc('Find More')?></strong></p>
+      <ul>
+        <li><a href="<?=$this->url('browse-home')?>"><?=$this->transEsc('Browse the Catalog')?></a></li>
+        <li><a href="<?=$this->url('alphabrowse-home')?>"><?=$this->transEsc('Browse Alphabetically')?></a></li>
+        <li><a href="<?=$this->url('channels-home')?>"><?=$this->transEsc('channel_explore')?></a></li>
+        <li><a href="<?=$this->url('search-reserves')?>"><?=$this->transEsc('Course Reserves')?></a></li>
+        <li><a href="<?=$this->url('search-newitem')?>"><?=$this->transEsc('New Items')?></a></li>
+      </ul>
+    </div>
+    <div class="footer-column">
+      <p><strong><?=$this->transEsc('Need Help?')?></strong></p>
+      <ul>
+        <li><a href="<?=$this->url('help-home')?>?topic=search&amp;_=<?=time() ?>" data-lightbox class="help-link"><?=$this->transEsc('Search Tips')?></a></li>
+        <li><a href="<?=$this->url('content-page', ['page' => 'asklibrary']) ?>"><?=$this->transEsc('Ask a Librarian')?></a></li>
+        <li><a href="<?=$this->url('content-page', ['page' => 'faq']) ?>"><?=$this->transEsc('FAQs')?></a></li>
+      </ul>
+    </div>
   </div>
-  <div class="col-sm-4">
-    <p><strong><?=$this->transEsc('Find More')?></strong></p>
-    <ul>
-      <li><a href="<?=$this->url('browse-home')?>"><?=$this->transEsc('Browse the Catalog')?></a></li>
-      <li><a href="<?=$this->url('alphabrowse-home')?>"><?=$this->transEsc('Browse Alphabetically')?></a></li>
-      <li><a href="<?=$this->url('channels-home')?>"><?=$this->transEsc('channel_explore')?></a></li>
-      <li><a href="<?=$this->url('search-reserves')?>"><?=$this->transEsc('Course Reserves')?></a></li>
-      <li><a href="<?=$this->url('search-newitem')?>"><?=$this->transEsc('New Items')?></a></li>
-    </ul>
+  <div class="poweredby">
+    <?=$this->layout()->poweredBy ?>
   </div>
-  <div class="col-sm-4">
-    <p><strong><?=$this->transEsc('Need Help?')?></strong></p>
-    <ul>
-      <li><a href="<?=$this->url('help-home')?>?topic=search&amp;_=<?=time() ?>" data-lightbox class="help-link"><?=$this->transEsc('Search Tips')?></a></li>
-      <li><a href="<?=$this->url('content-page', ['page' => 'asklibrary']) ?>"><?=$this->transEsc('Ask a Librarian')?></a></li>
-      <li><a href="<?=$this->url('content-page', ['page' => 'faq']) ?>"><?=$this->transEsc('FAQs')?></a></li>
-    </ul>
-  </div>
-</div>
+</footer>
diff --git a/themes/bootstrap3/templates/header.phtml b/themes/bootstrap3/templates/header.phtml
index ba0ad2c28af5749535dfb222b95bd2212a501bc6..457b6b07bad04fb98f94485336c21d10643cd1a8 100644
--- a/themes/bootstrap3/templates/header.phtml
+++ b/themes/bootstrap3/templates/header.phtml
@@ -72,8 +72,10 @@
     </div>
   <? endif; ?>
 </div>
-<div class="search container navbar">
-  <nav class="nav searchbox hidden-print">
-    <?=$this->layout()->searchbox ?>
-  </nav>
-</div>
+<? if ($this->layout()->searchbox !== false): ?>
+  <div class="search container navbar">
+    <nav class="nav searchbox hidden-print">
+      <?=$this->layout()->searchbox ?>
+    </nav>
+  </div>
+<? endif; ?>
diff --git a/themes/bootstrap3/templates/layout/layout.phtml b/themes/bootstrap3/templates/layout/layout.phtml
index 0b37235de963c69f282d183b52f94f4c1a6a69c8..622c5e5d976696e95a2a6b131831097e88786bd5 100644
--- a/themes/bootstrap3/templates/layout/layout.phtml
+++ b/themes/bootstrap3/templates/layout/layout.phtml
@@ -138,7 +138,9 @@ JS;
       <? endif; ?>
       <a class="sr-only" href="#content"><?=$this->transEsc('Skip to content') ?></a>
       <?=$this->render('header.phtml')?>
-      <div class="breadcrumbs container">
+    </header>
+    <nav class="breadcrumbs">
+      <div class="container">
         <? if((!isset($this->layout()->showBreadcrumbs) || $this->layout()->showBreadcrumbs == true)
           && !empty($this->layout()->breadcrumbs)
           && $this->layout()->breadcrumbs !== false
@@ -163,18 +165,13 @@ JS;
           </ul>
         <? endif; ?>
       </div>
-    </header>
+    </nav>
     <div role="main" class="main">
       <div id="content" class="container">
         <?=$this->layout()->content ?>
       </div>
     </div>
-    <footer class="hidden-print">
-      <div class="container">
-        <?=$this->render('footer.phtml')?>
-        <?=$this->layout()->poweredBy ?>
-      </div>
-    </footer>
+    <?=$this->render('footer.phtml')?>
     <!-- MODAL IN CASE WE NEED ONE -->
     <div id="modal" class="modal fade hidden-print" tabindex="-1" role="dialog" aria-labelledby="modalTitle" aria-hidden="true">
       <div class="modal-dialog">