diff --git a/maloja/web/common/footer.html b/maloja/web/common/footer.html
index 7de3865..4f4a96f 100644
--- a/maloja/web/common/footer.html
+++ b/maloja/web/common/footer.html
@@ -22,6 +22,6 @@
 	</span>
 </div>
 
-<a href="/admin"><div title="Server Administration" id="settingsicon">
+<a href="/admin_overview"><div title="Server Administration" id="settingsicon">
 	<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z"/></svg>
 </div></a>
diff --git a/maloja/web/jinja/admin.jinja b/maloja/web/jinja/abstracts/admin.jinja
similarity index 96%
rename from maloja/web/jinja/admin.jinja
rename to maloja/web/jinja/abstracts/admin.jinja
index 7e211fb..76c95ad 100644
--- a/maloja/web/jinja/admin.jinja
+++ b/maloja/web/jinja/abstracts/admin.jinja
@@ -1,4 +1,4 @@
-{% extends "base.jinja" %}
+{% extends "abstracts/base.jinja" %}
 {% block title %}Maloja - Backend{% endblock %}
 
 
diff --git a/maloja/web/jinja/base.jinja b/maloja/web/jinja/abstracts/base.jinja
similarity index 100%
rename from maloja/web/jinja/base.jinja
rename to maloja/web/jinja/abstracts/base.jinja
diff --git a/maloja/web/jinja/admin_issues.jinja b/maloja/web/jinja/admin_issues.jinja
index d078a31..8dcabfb 100644
--- a/maloja/web/jinja/admin_issues.jinja
+++ b/maloja/web/jinja/admin_issues.jinja
@@ -1,5 +1,5 @@
 {% set page ='admin_issues' %}
-{% extends "admin.jinja" %}
+{% extends "abstracts/admin.jinja" %}
 {% block title %}Maloja - Issues{% endblock %}
 
 
diff --git a/maloja/web/jinja/admin_manual.jinja b/maloja/web/jinja/admin_manual.jinja
index 5f55c60..6815bd7 100644
--- a/maloja/web/jinja/admin_manual.jinja
+++ b/maloja/web/jinja/admin_manual.jinja
@@ -1,5 +1,5 @@
 {% set page ='admin_manual' %}
-{% extends "admin.jinja" %}
+{% extends "abstracts/admin.jinja" %}
 {% block title %}Maloja - Manual Scrobbling{% endblock %}
 
 {% block scripts %}
diff --git a/maloja/web/jinja/admin_overview.jinja b/maloja/web/jinja/admin_overview.jinja
index 2b4ece2..5c0d285 100644
--- a/maloja/web/jinja/admin_overview.jinja
+++ b/maloja/web/jinja/admin_overview.jinja
@@ -1,5 +1,5 @@
 {% set page ='admin_overview' %}
-{% extends "admin.jinja" %}
+{% extends "abstracts/admin.jinja" %}
 {% block title %}Maloja - Admin Panel{% endblock %}
 
 {% block scripts %}
diff --git a/maloja/web/jinja/admin_setup.jinja b/maloja/web/jinja/admin_setup.jinja
index f7ec84e..b7c46c9 100644
--- a/maloja/web/jinja/admin_setup.jinja
+++ b/maloja/web/jinja/admin_setup.jinja
@@ -1,5 +1,5 @@
 {% set page ='admin_setup' %}
-{% extends "admin.jinja" %}
+{% extends "abstracts/admin.jinja" %}
 {% block title %}Maloja - Setup{% endblock %}
 
 {% block scripts %}
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index 99b030a..a1c8701 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -1,4 +1,4 @@
-{% extends "base.jinja" %}
+{% extends "abstracts/base.jinja" %}
 {% block title %}Maloja - {{ artist }}{% endblock %}
 
 {% block scripts %}
diff --git a/maloja/web/jinja/charts_artists.jinja b/maloja/web/jinja/charts_artists.jinja
index 4866901..5648ab7 100644
--- a/maloja/web/jinja/charts_artists.jinja
+++ b/maloja/web/jinja/charts_artists.jinja
@@ -1,4 +1,4 @@
-{% extends "base.jinja" %}
+{% extends "abstracts/base.jinja" %}
 {% block title %}Maloja - {{ artist }}{% endblock %}
 
 {% block scripts %}
diff --git a/maloja/web/jinja/charts_tracks.jinja b/maloja/web/jinja/charts_tracks.jinja
index b25b11e..cb31f59 100644
--- a/maloja/web/jinja/charts_tracks.jinja
+++ b/maloja/web/jinja/charts_tracks.jinja
@@ -1,4 +1,4 @@
-{% extends "base.jinja" %}
+{% extends "abstracts/base.jinja" %}
 {% block title %}Maloja - Track Charts{% endblock %}
 
 {% block scripts %}
diff --git a/maloja/web/jinja/error.jinja b/maloja/web/jinja/error.jinja
index 5ce08a2..3fe843b 100644
--- a/maloja/web/jinja/error.jinja
+++ b/maloja/web/jinja/error.jinja
@@ -1,4 +1,4 @@
-{% extends "admin.jinja" %}
+{% extends "abstracts/base.jinja" %}
 
 {% block content %}
 	<table class="top_info">
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 69e1deb..d8edd89 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -1,4 +1,4 @@
-{% extends "base.jinja" %}
+{% extends "abstracts/base.jinja" %}
 {% block title %}Maloja - {{ track.title }}{% endblock %}
 
 {% block scripts %}