diff --git a/templates/header.html b/templates/base.html
similarity index 51%
rename from templates/header.html
rename to templates/base.html
index 8890e3c..01123c0 100644
--- a/templates/header.html
+++ b/templates/base.html
@@ -1,15 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <title>Your page title</title>
-    <!-- Required meta tags -->
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    {{ bootstrap.load_css() }}
-    <link rel="stylesheet" href="{{url_for('static', filename='style.css')}}">
-    <!-- color mode js-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
+    {% block head %}
+        <meta charset="UTF-8">
+        <title>TornActivityTracker{% block title %}{% endblock %}</title>
+        <!-- Required meta tags -->
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+        {% block styles %}
+        {{ bootstrap.load_css() }}
+        <link rel="stylesheet" href="{{url_for('static', filename='style.css')}}">
+        <!-- color mode js-->
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css">
+        {% endblock %}
+    {% endblock %}
 </head>
 <body>
     <header>
@@ -29,4 +33,15 @@
             </div>
         </nav>
     </header>
-    <main>
\ No newline at end of file
+    <main>
+        {% block content %}
+        {% endblock %}
+
+
+    </main>
+    {% block scripts %}
+    {{ bootstrap.load_js() }}
+    {% endblock %}
+    <script src="{{url_for('static', filename='color_mode.js')}}"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/download_results.html b/templates/download_results.html
index ab5c09b..e156439 100644
--- a/templates/download_results.html
+++ b/templates/download_results.html
@@ -1,5 +1,6 @@
 
-{% include "header.html" %}
+{% extends 'base.html' %}
+{% block content %}
         <section class="container-fluid d-flex justify-content-center">
             <div class="container-md my-5 mx-2 shadow-lg p-4 ">
                 <div class="container-sm">
@@ -90,4 +91,4 @@
          {{ bootstrap.load_js() }}
         <script src="{{url_for('.static', filename='download_results.js')}}"></script>
     {% endblock %}
-    {% include "footer.html" %}
\ No newline at end of file
+{% endblock content %}
diff --git a/templates/footer.html b/templates/footer.html
deleted file mode 100644
index 4d370db..0000000
--- a/templates/footer.html
+++ /dev/null
@@ -1,5 +0,0 @@
-    </main>
-    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>   
-    <script src="{{url_for('static', filename='color_mode.js')}}"></script>
-</body>
-</html>
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index 8a013ab..60a2233 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1,4 +1,5 @@
-{% include "header.html" %}
+{% extends 'base.html' %}
+{% block content %}
         <section id="scrapingFormContainer" class="container-fluid d-flex justify-content-center">
             <div class="container-md my-5 mx-2 shadow-lg p-4 ">
                 <h2>Config</h2>
@@ -26,7 +27,7 @@
         <section id="resultsContainer" class="container-fluid d-flex justify-content-center">
             <div class="container-md my-5 mx-2 shadow-lg p-4" style="height: 500px;">
                 <div class="row">
-                    <div class="col-7">
+                    <div class="col-8">
                         <h2>Logs</h2>
                         <pre id="logs" class="pre-scrollable" style="height: 350px; overflow:scroll; "><code></code></pre>
                         <div class="btn-group btn-group-sm">
@@ -41,9 +42,7 @@
                 </div>
             </div>
         </section>
-    {% block scripts %}
-        {{ bootstrap.load_js() }}
-        <link rel="stylesheet" href="{{ url_for('.static', filename='style.css') }}">
-        <script src="{{url_for('.static', filename='app.js')}}"></script>
-    {% endblock %}
-    {% include "footer.html" %}
\ No newline at end of file
+        {% block scripts %}
+        <script src="{{url_for('static', filename='app.js')}}"></script>
+        {% endblock %}    
+{% endblock content %}
