diff --git a/flask_soc_site/templates/history.html b/flask_soc_site/templates/history.html
index 0f9b091..8cf500b 100644
--- a/flask_soc_site/templates/history.html
+++ b/flask_soc_site/templates/history.html
@@ -1,7 +1,77 @@
 {% extends "layout.html" %}
 
-<div class="test">
+{% block content %}
 
-  <button type="button">History</button>
+<div class="clear-history">
+  <form method="post" action="/history">
+    <input type="submit" value="Clear history" name="clear_history"/>
+  </form>
 </div>
 
+<div class="table-container">
+  <div class="results-table-new">
+    <table id="data" class="table table-striped">
+      <thead>
+        <th>IP address</th>
+        <th>VirusTotal</th>
+        <th>AbuseIPDB</th>
+        <th>Domain</th>
+        <th>Registration country</th>
+        <th>Registration date</th>
+        <th>Email security</th>
+      </thead>
+      <tbody>
+{% for host in session_history %}
+        <tr>
+          <td>{{host.host}}</td>
+          <td>Score: {{host.vt['score']}} / {{host.vt['total']}}<br>
+            Last updated: {{host.vt['last_update']}}<br>
+          </td>
+          <td>Score: {{host.abuseipdb['score']}}
+            Last reported: {{host.abuseipdb['last_reported']}}</td>
+          <td>{{host.domain}}</td>
+          <td>{{host.metadata['registrar_country']}}</td>
+          <td>{{host.metadata['creation_date']}}</td>
+          <td>SPF: {{host.email_security[0]}}, DMARC: {{host.email_security[1]}}</td>
+        </tr>
+        <tr>
+          <td colspan="7" id="info">
+            <p>
+              <b>VirusTotal</b>
+              <br>
+              {% if host.vt['score'] > 0 %}
+              Vendor marked this host as malicious or suspicious:
+              {{host.vt['vendors']|join(', ')}}
+              {{host.vt['score']}}
+              {% else %}
+              No vendors marked this host as malicious or suspicious.
+              {% endif %}
+              <br>
+              <b>AbuseIPDB</b>
+              <br>
+              IP address is: {{host.abuseipdb['IP_address']}}<br>
+              Is this Tor: {{host.abuseipdb['Tor']}}<br>
+              Usage: {{host.abuseipdb['usage']}}<br>
+              <br>
+              <b>Domain registration</b>
+              <br>
+              {% if host.registrar|length %}
+              Registrar is: {{host.registar}}<br>
+              {% else %}
+              No registrar name was found<br>
+              {% endif %}
+              <br>
+              <b>Email security</b>
+              <br>
+              <!--DONE: Display some of the metadata info-->
+              <!--TODO: Display some SPF/DMARC info. To do that, I apparently have to turn host.email_security[x] into a dict.  -->
+            </p>
+          </td>
+        </tr>
+{% endfor %}
+      </tbody>
+    </table>
+  </div>
+</div>
+
+{% endblock %}
diff --git a/flask_soc_site/templates/layout.html b/flask_soc_site/templates/layout.html
index 0301fca..d7cc750 100644
--- a/flask_soc_site/templates/layout.html
+++ b/flask_soc_site/templates/layout.html
@@ -22,8 +22,9 @@
 
 <body>
 
+  {% include "navbar.html" %}
+  {# {% include "test.html" %} #}
   {% block content %} {% endblock %}
-
   <script type="text/javascript" charset="utf8" src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
   <script type="text/javascript" charset="utf8"
     src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.js"></script>
diff --git a/flask_soc_site/templates/lookup.html b/flask_soc_site/templates/lookup.html
index 459d1a1..0a059f1 100644
--- a/flask_soc_site/templates/lookup.html
+++ b/flask_soc_site/templates/lookup.html
@@ -1,14 +1,13 @@
-{% extends "layout.html" %} 
+{% extends "layout.html" %}
 
 {% block content %}
 
-{% include "test.html" %}
+{% include "test.html" %} 
 
 {% include "empty_form.html" %}
 
-{% include "results.html" %}
-
-{% include "temp.html" %}
+{# {% include "results.html" %} #}
 
 {% endblock %}
 
+
diff --git a/flask_soc_site/templates/navbar.html b/flask_soc_site/templates/navbar.html
index 4c7aa4a..0bf100f 100644
--- a/flask_soc_site/templates/navbar.html
+++ b/flask_soc_site/templates/navbar.html
@@ -7,7 +7,7 @@
   }
 </style>
 -->
-
+{% block content %}
 <nav class="navbar">
   <!--Wound up going for a really simple navbar included in layout.html which as Jinja url_for-links to both functions. -->
   <ul>
@@ -15,3 +15,4 @@
     <li><b><a href="{{url_for('history')}}">History</a></b></li>
   </ul>
 </nav>
+{% endblock %}
diff --git a/flask_soc_site/templates/results-overview-new.html b/flask_soc_site/templates/results-overview-new.html
index 4ced2c8..d3c4196 100644
--- a/flask_soc_site/templates/results-overview-new.html
+++ b/flask_soc_site/templates/results-overview-new.html
@@ -1,3 +1,5 @@
+{% include "test.html" %}
+
 <div class="errors-container">
   {% if errors_present %}
   {% for error in errors %}
diff --git a/flask_soc_site/templates/results.html b/flask_soc_site/templates/results.html
index c48903e..fde8918 100644
--- a/flask_soc_site/templates/results.html
+++ b/flask_soc_site/templates/results.html
@@ -1,10 +1,10 @@
-{% extends "layout.html" %}
+ {% extends "layout.html" %}
 
 {% block content %}
 
 {# For multiple results, maybe make a top results overview and then a navigation menu to specific URL pages? See: https://realpython.com/primer-on-jinja-templating/#include-a-navigation-menu #}
 
-{% include "test.html" %}
+  {# {% include "test.html" %} #}
 
 {% include "results-overview-new.html" %} 
 
diff --git a/flask_soc_site/templates/test.html b/flask_soc_site/templates/test.html
index f03f8ca..b593862 100644
--- a/flask_soc_site/templates/test.html
+++ b/flask_soc_site/templates/test.html
@@ -1,3 +1,5 @@
+{% block content %}
+
 <div class="test_container">
   <div class="background_container">
     <!--  <div class="test_forms_container"> -->
@@ -19,3 +21,5 @@
     </div>
   </div>
 </div>
+
+{% endblock %}

IP address	VirusTotal	AbuseIPDB	Domain	Registration country	Registration date	Email security
{{host.host}}	Score: {{host.vt['score']}} / {{host.vt['total']}} + Last updated: {{host.vt['last_update']}} +	Score: {{host.abuseipdb['score']}} + Last reported: {{host.abuseipdb['last_reported']}}	{{host.domain}}	{{host.metadata['registrar_country']}}	{{host.metadata['creation_date']}}	SPF: {{host.email_security[0]}}, DMARC: {{host.email_security[1]}}
+ + VirusTotal + + {% if host.vt['score'] > 0 %} + Vendor marked this host as malicious or suspicious: + {{host.vt['vendors']\|join(', ')}} + {{host.vt['score']}} + {% else %} + No vendors marked this host as malicious or suspicious. + {% endif %} + + AbuseIPDB + + IP address is: {{host.abuseipdb['IP_address']}} + Is this Tor: {{host.abuseipdb['Tor']}} + Usage: {{host.abuseipdb['usage']}} + + Domain registration + + {% if host.registrar\|length %} + Registrar is: {{host.registar}} + {% else %} + No registrar name was found + {% endif %} + + Email security + + + + +