diff --git a/InvenTree/templates/503.html b/InvenTree/templates/503.html
index f7381aeb69..8cef12212d 100644
--- a/InvenTree/templates/503.html
+++ b/InvenTree/templates/503.html
@@ -1,14 +1,17 @@
-{% extends "account/base.html" %}
+{% extends "auth_base.html" %}
 {% load i18n %}
 
-{% block head_title %}
-{% trans "Page is in Maintenance" %}
+
+{% block head %}
+<meta http-equiv="refresh" content="30">
 {% endblock %}
 
-{% block content %}
-    <h3>{% trans "The Page is in currently in maintenance mode" %}</h3>
+{% block page_title %}
+    {% trans 'Site is in Maintenance' %}
+{% endblock %}
 
-    <div class='alert alert-danger alert-block'>
-        {% trans "This page will reload each minute until the page becomes available again." %}
-    </div>
+{% block body_title %}{% trans 'Site is in Maintenance' %}{% endblock %}
+
+{% block content %}
+{% trans 'The site is currently in maintenance and should be up again soon!' %}
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/auth_base.html b/InvenTree/templates/auth_base.html
new file mode 100644
index 0000000000..603b417e78
--- /dev/null
+++ b/InvenTree/templates/auth_base.html
@@ -0,0 +1,69 @@
+{% extends "skeleton.html" %}
+{% load static %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block page_title %}
+{% inventree_title %} | {% block head_title %}{% endblock %}
+{% endblock %}
+
+{% block body_class %}login-screen{% endblock %}
+
+{% block body %}
+    <!-- 
+        Background Image Attribution: https://unsplash.com/photos/Ixvv3YZkd7w
+    -->
+    <div class='container-fluid'>
+        <div class='notification-area' id='alerts'>
+            <!-- Div for displayed alerts -->
+        </div>
+    </div>
+
+    <div class='main body-wrapper login-screen d-flex'>
+
+
+        <div class='login-container'>
+        <div class="row">
+            <div class='container-fluid'>
+
+                <div class='clearfix content-heading login-header d-flex flex-wrap'>
+                    <img class="pull-left" src="{% static 'img/inventree.png' %}" width="60" height="60"/>
+                    {% include "spacer.html" %}
+                    <span class='float-right'><h3>{% block body_title %}{% inventree_title %}{% endblock %}</h3></span>
+                </div>
+            </div>
+                <div class='container-fluid'>
+                    <hr>
+                    {% block content %}
+                    {% endblock %}
+                </div>
+        </div>
+        </div>
+
+        {% block extra_body %}
+        {% endblock %}
+    </div>
+{% endblock %}
+
+{% block js_base %}
+<script type='text/javascript'>
+$(document).ready(function () {
+    // notifications
+    {% if messages %}
+    {% for message in messages %}
+    showAlertOrCache(
+        '{{ message }}',
+        true,
+        {
+            style: 'info',
+        }
+    );
+    {% endfor %}
+    {% endif %}
+
+    inventreeDocReady();
+});
+</script>
+{% endblock %}
+</body>
+</html>
\ No newline at end of file
diff --git a/InvenTree/templates/skeleton.html b/InvenTree/templates/skeleton.html
new file mode 100644
index 0000000000..ffd634e4f4
--- /dev/null
+++ b/InvenTree/templates/skeleton.html
@@ -0,0 +1,99 @@
+{% load static %}
+{% load i18n %}
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+<!-- Required meta tags -->
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+<!-- Favicon -->
+<link rel="apple-touch-icon" sizes="57x57" href="{% static 'img/favicon/apple-icon-57x57.png' %}">
+<link rel="apple-touch-icon" sizes="60x60" href="{% static 'img/favicon/apple-icon-60x60.png' %}">
+<link rel="apple-touch-icon" sizes="72x72" href="{% static 'img/favicon/apple-icon-72x72.png' %}">
+<link rel="apple-touch-icon" sizes="76x76" href="{% static 'img/favicon/apple-icon-76x76.png' %}">
+<link rel="apple-touch-icon" sizes="114x114" href="{% static 'img/favicon/apple-icon-114x114.png' %}">
+<link rel="apple-touch-icon" sizes="120x120" href="{% static 'img/favicon/apple-icon-120x120.png' %}">
+<link rel="apple-touch-icon" sizes="144x144" href="{% static 'img/favicon/apple-icon-144x144.png' %}">
+<link rel="apple-touch-icon" sizes="152x152" href="{% static 'img/favicon/apple-icon-152x152.png' %}">
+<link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicon/apple-icon-180x180.png' %}">
+<link rel="icon" type="image/png" sizes="192x192"  href="{% static 'img/favicon/android-icon-192x192.png' %}">
+<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
+<link rel="icon" type="image/png" sizes="96x96" href="{% static 'img/favicon/favicon-96x96.png' %}">
+<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
+<link rel="manifest" href="{% static 'img/favicon/manifest.json' %}">
+<meta name="msapplication-TileColor" content="#ffffff">
+<meta name="msapplication-TileImage" content="{% static 'img/favicon/ms-icon-144x144.png' %}">
+<meta name="theme-color" content="#ffffff">
+
+
+<!-- CSS -->
+<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
+<link rel="stylesheet" href="{% static 'fontawesome/css/brands.css' %}">
+<link rel="stylesheet" href="{% static 'fontawesome/css/solid.css' %}">
+<link rel="stylesheet" href="{% static 'select2/css/select2.css' %}">
+<link rel="stylesheet" href="{% static 'select2/css/select2-bootstrap-5-theme.css' %}">
+<link rel="stylesheet" href="{% static 'css/inventree.css' %}">
+
+{% block head_css %}
+{% endblock %}
+
+<style>
+    {% block css %}
+    {% endblock %}
+</style>
+
+{% block head %}
+{% endblock %}
+
+<title>
+{% block page_title %}
+{% endblock %}
+</title>
+</head>
+
+<body class='{% block body_class %}{% endblock %}'>
+{% block body %}
+{% endblock %}
+
+<!-- Scripts -->
+<script type="text/javascript" src="{% static 'script/jquery_3.3.1_jquery.min.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/jquery-ui/jquery-ui.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'bootstrap/js/bootstrap.bundle.min.js' %}"></script>
+{% block body_scripts_general %}
+{% endblock %}
+
+
+<!-- 3rd party general js -->
+<script type="text/javascript" src="{% static 'fullcalendar/main.js' %}"></script>
+<script type="text/javascript" src="{% static 'fullcalendar/locales-all.js' %}"></script>
+<script type="text/javascript" src="{% static 'select2/js/select2.full.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/moment.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/chart.min.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/clipboard.min.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/randomColor.min.js' %}"></script>
+
+<!-- general InvenTree -->
+<script type='text/javascript' src="{% static 'script/inventree/inventree.js' %}"></script>
+<script type='text/javascript' src="{% static 'script/inventree/notification.js' %}"></script>
+{% block body_scripts_inventree %}
+{% endblock %}
+
+<!-- fontawesome -->
+<script type='text/javascript' src="{% static 'fontawesome/js/solid.js' %}"></script>
+<script type='text/javascript' src="{% static 'fontawesome/js/brands.js' %}"></script>
+<script type='text/javascript' src="{% static 'fontawesome/js/fontawesome.js' %}"></script>
+
+{% block js_load %}
+{% endblock %}
+
+{% block js_base %}
+{% endblock %}
+
+{% block js %}
+{% endblock %}
+
+</body>
+</html>
\ No newline at end of file
