diff --git a/app/controllers/App.php b/app/controllers/App.php
deleted file mode 100644
index 425e0a3..0000000
--- a/app/controllers/App.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Aldine;
-
-use Sober\Controller\Controller;
-
-class App extends Controller
-{
-    public function siteLogo()
-    {
-        $custom_logo_id = get_theme_mod('custom_logo');
-        if (has_custom_logo()) {
-            return wp_get_attachment_image($custom_logo_id, 'original');
-        } else {
-            return file_get_contents(get_theme_file_path() . '/dist/' . asset_dir('images/logo.svg'));
-        }
-    }
-
-
-
-    public static function networkFooter($index)
-    {
-        if ($index === 2) {
-            if (get_option('pb_network_facebook')
-                || get_option('pb_network_twitter')
-                || is_active_sidebar("network-footer-block-$index")
-            ) {
-                return $index;
-            } else {
-                return 'empty';
-            }
-        }
-        return (is_active_sidebar("network-footer-block-$index")) ?
-            $index :
-            'empty';
-    }
-
-    public static function title()
-    {
-        if (is_home()) {
-            if ($home = get_option('page_for_posts', true)) {
-                return get_the_title($home);
-            }
-            return __('Latest Posts', 'aldine');
-        }
-        if (is_archive()) {
-            return get_the_archive_title();
-        }
-        if (is_search()) {
-            return sprintf(__('Search Results for %s', 'aldine'), get_search_query());
-        }
-        if (is_404()) {
-            return __('Not Found', 'aldine');
-        }
-        return get_the_title();
-    }
-
-
-
-    public function currentPage()
-    {
-        if (is_front_page()) {
-            return (get_query_var('page')) ? get_query_var('page') : 1;
-        } else {
-            return (get_query_var('paged')) ? get_query_var('paged') : 1;
-        }
-    }
-
-    public function currentSubject()
-    {
-        return (get_query_var('subject')) ? get_query_var('subject') : '';
-    }
-
-    public function currentLicense()
-    {
-        return (get_query_var('license')) ? get_query_var('license') : '';
-    }
-
-    public function currentOrderBy()
-    {
-        return (get_query_var('orderby')) ? get_query_var('orderby') : 'title';
-    }
-
-    public function previousPage()
-    {
-        if (is_front_page()) {
-            $page = (get_query_var('page')) ? get_query_var('page') : 1;
-        } else {
-            $page = (get_query_var('paged')) ? get_query_var('paged') : 1;
-        }
-
-        return ($page > 1) ? $page - 1 : 0;
-    }
-
-    public function nextPage()
-    {
-        if (is_front_page()) {
-            $page = (get_query_var('page')) ? get_query_var('page') : 1;
-        } else {
-            $page = (get_query_var('paged')) ? get_query_var('paged') : 1;
-        }
-
-        return $page + 1;
-    }
-}
diff --git a/header.php b/header.php
index 6125289..dbe0d8f 100644
--- a/header.php
+++ b/header.php
@@ -25,32 +25,31 @@
 	<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'pressbooks-aldine' ); ?></a>
 
 	<header id="masthead" class="site-header" role="banner">
-		<div class="site-branding">
-			<?php
-			the_custom_logo();
-			if ( is_front_page() && is_home() ) : ?>
-				<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+		<div class="container">
+		<a class="toggle" href="#navigation"><?php _e( 'Toggle menu', 'aldine' ); ?><span class="toggle__icon"></span></a>
+		<a class="banner__brand" href="<?php echo home_url( '/' ); ?>"><span class="clip"><?php echo get_bloginfo( 'name', 'display' ); ?></span></a>
+		<nav class="banner__navigation" id="navigation">
+			<?php if ( function_exists( 'pb_meets_minimum_requirements' ) && pb_meets_minimum_requirements() ) : ?>
+				<a class="banner__navigation--catalog" href="<?php echo home_url( '/catalog' ); ?>">Catalog</a>
+			<?php endif; ?>
+			<?php if ( get_option( 'pb_network_contact_form' ) ) : ?>
+				<a class="banner__navigation--contact" href="#contact">Contact</a>
+			<?php endif; ?>
+			<?php if ( ! is_user_logged_in() ) : ?>
+				<a class="banner__navigation--signin" href="<?php echo wp_login_url(); ?>"><?php _e( 'Sign in', 'aldine' ); ?></a>
+				<span class="banner__navigation--sep">/</span>
+				<a class="banner__navigation--signup" href="<?php echo network_home_url( '/wp-signup.php' ); ?>"><?php _e( 'Sign up', 'aldine' ); ?></a>
 			<?php else : ?>
-				<p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
-			<?php
-			endif;
-
-			$description = get_bloginfo( 'description', 'display' );
-if ( $description || is_customize_preview() ) : ?>
-				<p class="site-description"><?php echo $description; /* WPCS: xss ok. */ ?></p>
-			<?php
-			endif; ?>
-		</div><!-- .site-branding -->
-
-		<nav id="site-navigation" class="main-navigation">
-			<button type="button" class="menu-toggle" aria-controls="primary-menu" aria-expanded="false"><?php esc_html_e( 'Primary Menu', 'pressbooks-aldine' ); ?></button>
-			<?php
-				wp_nav_menu( [
-					'theme_location' => 'menu-1',
-					'menu_id'        => 'primary-menu',
-				] );
-			?>
-		</nav><!-- #site-navigation -->
+				<a class="banner__navigation--admin" href="<?php echo admin_url(); ?>"><?php _e( 'Admin', 'aldine' ); ?></a>
+				<span class="banner__navigation--sep">/</span>
+				<a class="banner__navigation--signout" href="<?php echo wp_logout_url(); ?>"><?php _e( 'Sign out', 'aldine' ); ?></a>
+			<?php endif; ?>
+		</nav>
+		<header class="banner__branding">
+			<h1><a href="{{ home_url('/' ); ?>"><?php echo get_bloginfo( 'name', 'display' ); ?></a></h1>
+			<p><?php echo get_bloginfo( 'description', 'display' ); ?></p>
+		</header>
+		</div>
 	</header><!-- #masthead -->
 
 	<div id="content" class="site-content">
diff --git a/views/partials/header.blade.php b/views/partials/header.blade.php
deleted file mode 100644
index 6860457..0000000
--- a/views/partials/header.blade.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<section class="banner" style="background-image: url(@if(is_front_page())
-  @php(header_image())
-@else
-  @asset('images/catalog-header.jpg')
-@endif);">
-  <div class="container">
-    <a class="toggle" href="#navigation">{{ __('Toggle menu', 'aldine') }}<span class="toggle__icon"></span></a>
-    <a class="banner__brand" href="{{ home_url('/') }}"><span class="clip">{{ get_bloginfo('name', 'display') }}</span>{!! $site_logo !!}</a>
-    <nav class="banner__navigation" id="navigation">
-        @if(function_exists('pb_meets_minimum_requirements') && pb_meets_minimum_requirements())
-          <a class="banner__navigation--catalog" href="{{ home_url('/catalog') }}">Catalog</a>
-        @endif
-        @if(get_option('pb_network_contact_form'))
-          <a class="banner__navigation--contact" href="#contact">Contact</a>
-        @endif
-        @if(!is_user_logged_in())
-          <a class="banner__navigation--signin" href="{{ wp_login_url() }}">{{ __('Sign in', 'aldine') }}</a>
-          <span class="banner__navigation--sep">/</span>
-          <a class="banner__navigation--signup" href="{{ network_home_url('/wp-signup.php') }}">{{ __('Sign up', 'aldine') }}</a>
-        @else
-          <a class="banner__navigation--admin" href="{{ admin_url() }}">{{ __('Admin', 'aldine') }}</a>
-          <span class="banner__navigation--sep">/</span>
-          <a class="banner__navigation--signout" href="{{ wp_logout_url() }}">{{ __('Sign out', 'aldine') }}</a>
-        @endif
-    </nav>
-    <header class="banner__branding">
-      <h1><a href="{{ home_url('/') }}">{{ get_bloginfo('name', 'display') }}</a></h1>
-      <p>{{ get_bloginfo('description', 'display') }}</p>
-    </header>
-  </div>
-</section>
diff --git a/views/partials/svg.blade.php b/views/partials/svg.blade.php
deleted file mode 100644
index 2112ec7..0000000
--- a/views/partials/svg.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg style="position: absolute; width: 0; height: 0;" width="0" height="0" xmlns="http://www.w3.org/2000/svg">
-	<defs>
-		<symbol id="icon-pressbooks" fill="currentColor" viewBox="0 0 45 44">
-			<path d="M44.195 41.872c0 .745-.618 1.346-1.377 1.346H1.377C.617 43.219 0 42.617 0 41.872V1.347C0 .604.618 0 1.377 0h41.44c.76 0 1.378.604 1.378 1.347v40.525zM15.282 10.643h-5.21v21.43h3.304V24h1.906c1.435 0 2.656-.5 3.665-1.504 1.008-1.004 1.513-2.213 1.513-3.626v-3.113c0-1.47-.444-2.678-1.33-3.625-.956-.993-2.24-1.489-3.848-1.489zm1.977 5.165h-.001v3.131c0 .513-.184.952-.55 1.318a1.826 1.826 0 0 1-1.338.547h-1.994v-6.86h1.995c.571 0 1.029.171 1.372.513.344.342.516.792.516 1.35zm5.84 16.265h6.118c.828 0 1.662-.25 2.502-.752a4.642 4.642 0 0 0 1.73-1.779c.526-.945.788-2.097.788-3.455 0-.545-.04-1.043-.122-1.486-.163-.868-.414-1.575-.751-2.122-.513-.81-1.137-1.352-1.871-1.625a3.325 3.325 0 0 0 1.154-.839c.78-.866 1.173-2.018 1.173-3.455 0-.876-.105-1.635-.315-2.274-.386-1.198-1.027-2.08-1.925-2.652-1.049-.672-2.225-1.008-3.531-1.008h-4.95v21.447zm3.568-12.69v-5.475h1.382c.652 0 1.184.212 1.592.634.443.456.665 1.13.665 2.018 0 .537-.065.987-.193 1.352-.35.982-1.039 1.471-2.064 1.471h-1.382zm0 9.493v-6.397h1.382c.815 0 1.433.25 1.853.751.466.549.7 1.42.7 2.617 0 .502-.075.948-.227 1.335-.432 1.13-1.208 1.694-2.326 1.694h-1.382z" />
-		</symbol>
-	</defs>
-</svg>