diff --git a/PDMI/store/templates/store/store-navbar.html b/PDMI/store/templates/store/base.html
similarity index 84%
rename from PDMI/store/templates/store/store-navbar.html
rename to PDMI/store/templates/store/base.html
index 454cea2..c4bc802 100644
--- a/PDMI/store/templates/store/store-navbar.html
+++ b/PDMI/store/templates/store/base.html
@@ -1,4 +1,5 @@
-{% extends "base/navbar.html" %}
+{% extends "base/base.html" %}
+
{% block 'navbar-right' %}
{% if user.is_authenticated %}
@@ -17,24 +18,33 @@
+{% endif %}
+{% endblock 'navbar-right' %}
+
+{% block body %}
+
+{% block main %}
+
+{% endblock main %}
+
+
+{% include "store/modal.html" %}
+{% endblock body %}
+
+{% block extra_js %}
-
-
-{% endif %}
-{% endblock 'navbar-right' %}
+{% endblock extra_js %}
diff --git a/PDMI/store/templates/store/index.html b/PDMI/store/templates/store/index.html
index 6da5174..1b7d6e3 100644
--- a/PDMI/store/templates/store/index.html
+++ b/PDMI/store/templates/store/index.html
@@ -1,11 +1,6 @@
-{% extends "base/base.html" %}
-
-{% block navbar %}
- {% include "store/store-navbar.html" %}
-{% endblock navbar %}
-
-{% block body %}
+{% extends "store/base.html" %}
+{% block main %}
-
-
-
-{% include "store/modal.html" %}
-
-{% endblock body %}
+{% endblock main %}
diff --git a/PDMI/store/templates/store/upload.html b/PDMI/store/templates/store/upload.html
index 086d8c6..7ad61ba 100644
--- a/PDMI/store/templates/store/upload.html
+++ b/PDMI/store/templates/store/upload.html
@@ -1,13 +1,10 @@
-{% extends "base/base.html" %}
+{% extends "store/base.html" %}
{% load static %}
-{% block extra_static %}
-
+{% block extra_css %}
-{% endblock extra_static %}
-{% block navbar %}
- {% include "store/store-navbar.html" %}
-{% endblock navbar %}
+{% endblock extra_css %}
+
{% block body %}
@@ -26,58 +23,62 @@
-
{% endblock body %}
+
+{% block extra_js %}
+
+
+{% endblock extra_js %}
diff --git a/PDMI/templates/base/base.html b/PDMI/templates/base/base.html
index e3d42a5..52c03b6 100644
--- a/PDMI/templates/base/base.html
+++ b/PDMI/templates/base/base.html
@@ -1,6 +1,7 @@
{% load static %}
+
{% block title %}PDMI - Python Discord Module Index{% endblock %}
@@ -11,22 +12,43 @@
-
+
+ {% block extra_css %}{% endblock extra_css %}
+
+
+
+
+
+ {% block body %}
+ {% endblock %}
+ {% include "base/legal.html" %}
- {% block extra_static %}{% endblock extra_static %}
-
-
- {% block navbar %}
- {% include "base/navbar.html" %}
- {% endblock navbar %}
- {% block body %}
- {% endblock %}
- {% include "base/legal.html" %}
+ {% block extra_js %}{% endblock extra_js %}
+
diff --git a/PDMI/templates/base/navbar.html b/PDMI/templates/base/navbar.html
deleted file mode 100644
index fb33bb8..0000000
--- a/PDMI/templates/base/navbar.html
+++ /dev/null
@@ -1,22 +0,0 @@
-