diff --git a/resources/assets/styles/layouts/pages/_catalog.scss b/resources/assets/styles/layouts/pages/_catalog.scss
index c108d56..2411b99 100644
--- a/resources/assets/styles/layouts/pages/_catalog.scss
+++ b/resources/assets/styles/layouts/pages/_catalog.scss
@@ -196,19 +196,19 @@
       text-decoration: none;
     }
 
-    .subject {
+    &__subject {
       height: rem(44);
       font-size: rem(14);
     }
 
-    .title {
+    &__title {
       height: rem(118);
       font-size: rem(16);
       font-weight: 600;
       line-height: (20/16);
     }
 
-    .read-more {
+    &__read-more {
       font-size: rem(14);
     }
   }
@@ -320,19 +320,19 @@
       margin: 0 percent(15, 735) 2rem 0;
       padding: 0 rem(14) rem(21.35);
 
-      .subject {
+      &__subject {
         height: rem(45.85);
         font-size: rem(18);
       }
 
-      .title {
+      &__title {
         height: rem(147.65);
         font-size: rem(22);
         font-weight: 600;
         line-height: (40/30);
       }
 
-      .read-more {
+      &__read-more {
         font-size: rem(16);
       }
     }
@@ -470,19 +470,19 @@
       margin: 0 0 2rem percent(39.5, 1221.5);
       padding: 1.5rem 1.85rem 2.1875rem;
 
-      .subject {
+      &__subject {
         height: 4.625rem;
         font-size: rem(24);
       }
 
-      .title {
+      &__title {
         height: 13rem;
         font-size: rem(30);
         font-weight: 500;
         line-height: (40/30);
       }
 
-      .read-more {
+      &__read-more {
         font-size: rem(18);
       }
     }
diff --git a/resources/assets/styles/layouts/pages/_front-page.scss b/resources/assets/styles/layouts/pages/_front-page.scss
index 2e5468c..13fe0b1 100644
--- a/resources/assets/styles/layouts/pages/_front-page.scss
+++ b/resources/assets/styles/layouts/pages/_front-page.scss
@@ -165,14 +165,14 @@
         text-align: center;
       }
 
-      .subject {
+      &__subject {
         height: 4.625rem;
         margin: 0;
         font-size: rem(24);
         text-align: center;
       }
 
-      .title {
+      &__title {
         height: 13rem;
         margin: 0;
         font-size: rem(30);
@@ -181,7 +181,7 @@
         text-align: left;
       }
 
-      .read-more {
+      &__read-more {
         margin: 0;
         font-size: rem(18);
         text-align: left;
diff --git a/resources/views/front-page.blade.php b/resources/views/front-page.blade.php
index 231c5bc..f271f9d 100644
--- a/resources/views/front-page.blade.php
+++ b/resources/views/front-page.blade.php
@@ -5,7 +5,7 @@
   @if(is_active_sidebar('front-page-block'))
     @php(dynamic_sidebar('front-page-block'))
   @else
-    @component('front-page-block')
+    @component('page-block')
       @slot('title')
         {{ __('About Pressbooks', 'aldine') }}
       @endslot
@@ -19,7 +19,29 @@
     @endcomponent
   @endif
   @if(get_option('pb_front_page_catalog'))
-    @include('partials.front-page-catalog')
+    <div id="latest-titles" class="latest-books">
+      <h3>{{ $latest_books_title }}</h3>
+      <div class="track">
+        <div class="books" data-total-pages="{{ $catalog_data['pages'] }}" @if($next_page <= $catalog_data['pages'])data-next-page="{{ $next_page }}"@endif>
+          @foreach($catalog_data['books'] as $book)
+            @include('partials.book', ['book' => $book])
+          @endforeach
+        </div>
+        @if($previous_page)
+          <a class="previous" data-page="{{ $previous_page }}" href="{{ network_home_url("/page/$previous_page/#latest-titles") }}">
+            @php(include get_theme_file_path() . '/dist/' . Aldine\svg_path('images/left-arrow.svg'))
+          </a>
+        @endif
+        @if($next_page <= $catalog_data['pages'])
+          <a class="next" data-page="{{ $next_page }}" href="{{ network_home_url("/page/$next_page/#latest-titles") }}">
+            @php(include get_theme_file_path() . '/dist/' . Aldine\svg_path('images/right-arrow.svg'))
+          </a>
+        @endif
+      </div>
+      <div class="catalog-link">
+        <a class="button button-inverse button-wide" href="{{ network_home_url('/catalog/') }}">{{ __('View Complete Catalog', 'aldine') }}</a>
+      </div>
+    </div>
   @endif
   </section>
 @endsection
diff --git a/resources/views/partials/book.blade.php b/resources/views/partials/book.blade.php
index 45fefcb..f0e1f7d 100644
--- a/resources/views/partials/book.blade.php
+++ b/resources/views/partials/book.blade.php
@@ -4,14 +4,14 @@
   data-subject="{{ sanitize_title(@$book['metadata']['keywords']) }}"
 >
   @if(isset($book['metadata']['keywords']))
-  <p class="subject">
+  <p class="book__subject">
     <a href="{{ network_home_url('/catalog/#') . $book['metadata']['keywords'] }}">{{ $book['metadata']['keywords'] }}</a>
   </p>
   @endif
-  <p class="title">
+  <p class="book__title">
     <a href="{{ $book['link'] }}">{{ $book['metadata']['name'] }}</a>
   </p>
-  <p class="read-more">
+  <p class="book__read-more">
     <a href="{{ $book['link'] }}">{{ __('About this book &rarr;', 'aldine') }}</a>
   </p>
 </div>
diff --git a/resources/views/partials/front-page-catalog.blade.php b/resources/views/partials/front-page-catalog.blade.php
deleted file mode 100644
index 4355873..0000000
--- a/resources/views/partials/front-page-catalog.blade.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<div id="latest-titles" class="latest-books">
-  <h3>{{ $latest_books_title }}</h3>
-  <div class="track">
-    <div class="books" data-total-pages="{{ $catalog_data['pages'] }}" @if($next_page <= $catalog_data['pages'])data-next-page="{{ $next_page }}"@endif>
-      @foreach($catalog_data['books'] as $book)
-        @include('partials.book', ['book' => $book])
-      @endforeach
-    </div>
-    @if($previous_page)<a class="previous" data-page="{{ $previous_page }}" href="{{ network_home_url("/page/$previous_page/#latest-titles") }}">@php(include get_theme_file_path() . '/dist/' . Aldine\svg_path('images/left-arrow.svg'))</a>@endif
-      @if($next_page <= $catalog_data['pages'])<a class="next" data-page="{{ $next_page }}" href="{{ network_home_url("/page/$next_page/#latest-titles") }}">@php(include get_theme_file_path() . '/dist/' . Aldine\svg_path('images/right-arrow.svg'))</a>@endif
-  </div>
-  <div class="catalog-link">
-    <a class="button button-inverse button-wide" href="{{ network_home_url('/catalog/') }}">{{ __('View Complete Catalog', 'aldine') }}</a>
-  </div>
-</div>
diff --git a/resources/views/partials/front-page-block.blade.php b/resources/views/partials/page-block.blade.php
similarity index 100%
rename from resources/views/partials/front-page-block.blade.php
rename to resources/views/partials/page-block.blade.php