diff --git a/templates/index.html b/templates/index.html
index 8b490d0..e8ebfb2 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,16 +1,6 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link
-      rel="stylesheet"
-      href="{{ url_for('static', filename='styles.css') }}"
-    />
-    <title>Temporary Indexing</title>
-  </head>
-  <body>
-    <h1 class="title">Temporary Indexing</h1>
+{% extends 'base.html' %}
+
+{% block content %}
 
     {% with messages = get_flashed_messages() %}
       {% if messages %}
@@ -28,36 +18,38 @@
       </div>
     {% endfor %}
 
-    <p>
-      {{ petname_message}}. You are anonymous.
+    <p class="display-2">
+      {{ petname_message }}
     </p>
 
+    <p class="intro">Welcome, {{ petname }}. You are anonymous.</p>
+
     {% if generation_message %}
-      <p> {{ generation_message }} </p>
+      <p class="lead"> {{ generation_message }} </p>
     {% endif %}
-  <div class="container">
     <div class="forms">
         <form class="metafields" method="POST" action="/upload" enctype="multipart/form-data">
           {{ upload_form.csrf_token }}
 
-          {{ upload_form.metadata.label }}
+          <span class="field-heading">{{ upload_form.metadata.label }}</span>
           {{ upload_form.metadata }}
+          <br>
+          <div class="fields">
+            <span class="field-heading">{{ upload_form.title.label }}</span>
+            {{ upload_form.title }}
 
-          {{ upload_form.title.label }}
-          {{ upload_form.title }}
-
-          {{ upload_form.authors.label }}
-          {{ upload_form.authors }}
+            <span class="field-heading">{{ upload_form.authors.label }}</span>
+            {{ upload_form.authors }}
 
-          {{ upload_form.comments.label }}
-          {{ upload_form.comments }}
+            <span class="field-heading">{{ upload_form.comments.label }}</span>
+            {{ upload_form.comments }}
 
-          {{ upload_form.timestamp.label }}
-          {{ upload_form.timestamp }}
-
-          {{ upload_form.tags.label }}
-          {{ upload_form.tags }}
+            <span class="field-heading">{{ upload_form.timestamp.label }}</span>
+            {{ upload_form.timestamp }}
 
+            <span class="field-heading">{{ upload_form.tags.label }}</span>
+            {{ upload_form.tags }}
+          </div>
           <input
             type="hidden"
             id="petname"
@@ -75,6 +67,5 @@
           <iframe src="{{ pdf }}"></iframe>
         </object>
       </div>
-    </div>
-  </body>
-</html>
+
+{% endblock %}
\ No newline at end of file
