diff --git a/theme/functions.php b/theme/functions.php
index 8e1127d..d0c9ed9 100644
--- a/theme/functions.php
+++ b/theme/functions.php
@@ -21,6 +21,7 @@ function windycoys_nav() {
 
 function windycoys_the_tags() {
   $tags = get_the_tags();
+  if (!$tags) return false;
   // Suppress NewsNow tag
   foreach($tags as $key=>$tag) {
     if($tag->name === "newsnow") {
diff --git a/theme/index.php b/theme/index.php
index c7c5437..7a6bc15 100644
--- a/theme/index.php
+++ b/theme/index.php
@@ -20,7 +20,7 @@
         </a>
       </h1>
       <div class="Article-content">
-        <?php the_content( __( 'Continue reading <span class="meta-nav">&raquo;</span>', 'windycoys' )  ); ?>
+        <?php the_content(__('Continue reading <span class="meta-nav">&raquo;</span>', 'windycoys')); ?>
       </div>
     </article>
   </section>
diff --git a/theme/page.php b/theme/page.php
new file mode 100644
index 0000000..842eb06
--- /dev/null
+++ b/theme/page.php
@@ -0,0 +1,38 @@
+<?php get_header(); ?>
+<main class="Grid">
+  <section class="Grid-logo">
+    <?php get_template_part('partials/logo') ?>
+  </section>
+  <?php if (have_posts()): while (have_posts()) : the_post(); ?>
+  <section class="Grid-article">
+    <article class="Article">
+      <h1 class="Article-title">
+        <a href="<?php the_permalink(); ?>">
+          <?php the_title(); ?>
+        </a>
+      </h1>
+      <div class="Article-content">
+        <?php the_content(__('Continue reading <span class="meta-nav">&raquo;</span>', 'windycoys')); ?>
+      </div>
+    </article>
+  </section>
+  <?php endwhile; ?>
+  <?php else: ?>
+  <section class="Grid-article">
+    <article class="Article">
+      <h1 class="Article-title">Sorry, there is no article to display</h1>
+      <div class="Article-content">
+        <a class="Link" href="<?php get_site_url() ?>/">Go back home</a>
+      </div>
+    </article>
+  </section>
+  <?php endif; ?>
+  <section class="Grid-banner">
+    <?php get_template_part('partials/banner') ?>
+  </section>
+  <section class="Grid-footer">
+    <?php get_template_part('partials/footer') ?>
+  </section>
+</main>
+<?php get_template_part('partials/navigation') ?>
+<?php get_footer() ?>
diff --git a/theme/single.php b/theme/single.php
index 50ea4b0..c8ee568 100644
--- a/theme/single.php
+++ b/theme/single.php
@@ -20,7 +20,7 @@
         </a>
       </h1>
       <div class="Article-content">
-        <?php the_content( __( 'Continue reading <span class="meta-nav">&raquo;</span>', 'windycoys' )  ); ?>
+        <?php the_content(__('Continue reading <span class="meta-nav">&raquo;</span>', 'windycoys')); ?>
       </div>
     </article>
   </section>