diff --git a/.gitignore b/.gitignore
index 280fb6b..005984e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 /data/*
 /data/logs/*
 /data/tls/*
-/data/django_static/*
+/data/static/*
 /data/profilepictures/*
 /data/archive/*
 !/data/logs/
diff --git a/README.md b/README.md
index 74a7248..f2a4bf6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Drinks Manager
+# Drinks Manager (Season 3)
 
 Note: This software is tailored to my own needs.
 I probably won't accept feature requests, and don't recommend you
diff --git a/app/locales/de/LC_MESSAGES/django.mo b/app/locales/de/LC_MESSAGES/django.mo
index 5d60623..2e84d2f 100644
Binary files a/app/locales/de/LC_MESSAGES/django.mo and b/app/locales/de/LC_MESSAGES/django.mo differ
diff --git a/app/locales/de/LC_MESSAGES/django.po b/app/locales/de/LC_MESSAGES/django.po
index 278ff86..9900f3a 100644
--- a/app/locales/de/LC_MESSAGES/django.po
+++ b/app/locales/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-01 19:29+0100\n"
+"POT-Creation-Date: 2023-11-01 18:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Julian Müller (ChaoticByte)\n"
 "Language: DE\n"
@@ -207,14 +207,6 @@ msgstr "Tag"
 msgid "order sum"
 msgstr "Bestellungen"
 
-#: app/templates/statistics.html:72 app/templates/statistics.html:89
-msgid "user"
-msgstr "Benutzer"
-
-#: app/templates/statistics.html:73 app/templates/statistics.html:90
-msgid "sum"
-msgstr "Summe"
-
 #: app/templates/statistics.html:86
 msgid "deposit sum"
 msgstr "Einzahlungen"
diff --git a/app/models.py b/app/models.py
index 717a1cf..681a433 100644
--- a/app/models.py
+++ b/app/models.py
@@ -40,7 +40,6 @@ class Drink(models.Model):
     do_not_count = models.BooleanField(default=False)
 
     def delete(self, *args, **kwargs):
-        # we flag the field as deleted.
         self.deleted = True
         super().save()
 
@@ -108,9 +107,10 @@ class Order(models.Model):
     price_sum = models.DecimalField(max_digits=6, decimal_places=2, default=0, editable=False)
     content_litres = models.DecimalField(max_digits=6, decimal_places=3, default=0, editable=False)
 
+    # TODO: Add more comments on how and why the save & delete functions are implemented
+    # address this in a refactoring issue.
+
     def save(self, *args, **kwargs):
-        # saving this may affect other fields
-        # so we reimplement the save function
         drink = Drink.objects.get(pk=self.drink.pk)
         if self._state.adding and drink.available > 0:
             if not drink.do_not_count:
@@ -126,7 +126,6 @@ class Order(models.Model):
             raise ValidationError("This entry can't be changed.")
     
     def delete(self, *args, **kwargs):
-        # when deleting, we affect other fields as well.
         self.user.balance += self.price_sum
         self.user.save()
         drink = Drink.objects.get(pk=self.drink.pk)
diff --git a/static/css/main.css b/app/static/css/main.css
similarity index 67%
rename from static/css/main.css
rename to app/static/css/main.css
index ea44432..4ba0fc7 100644
--- a/static/css/main.css
+++ b/app/static/css/main.css
@@ -1,4 +1,4 @@
-/* Fonts */
+/* Font */
 
 @font-face {
     font-family: "Inter";
@@ -18,39 +18,26 @@
 :root {
     --font-family: "Inter";
     --color: #fafafa;
-    --color-disabled: #ffffff50;
-    --color-error: #ff817c;
-    --bg-page: linear-gradient(
-        -10deg,
-        #071c29 10%,
-        #4a8897
-    );
-    --bg-color: #ffffff35;
-    --bg-color2: #ffffff25;
-    --bg-hover-color: #ffffff50;
-    --border-color: #ffffff50;
+    --color-error: #ff682c;
+    --bg-page-color: #222222;
+    --bg-color: #4e4e4e;
+    --bg-hover-color: #636363;
+    --bg-color2: #383838;
+    --bg-hover-color2: #4a4a4a;
+    --border-color: #808080;
     --bg-globalmessage: #161616;
-    --border-radius: .6rem;
-    --element-padding: .6rem .8rem;
+    --border-radius: .5rem;
 }
 
 /* General */
 
-body,
-input,
-select,
-button, .button
-{
-    font-family: var(--font-family);
-}
-
 body {
     margin: 0;
     padding: 0;
     width: 100vw;
     min-height: 100vh;
-    font-size: 17px;
-    background: var(--bg-page);
+    font-family: var(--font-family);
+    background: var(--bg-page-color);
     color: var(--color);
     overflow-x: hidden;
 }
@@ -60,7 +47,7 @@ a {
 }
 
 h1 {
-    font-size: 28px;
+    font-size: 1.8rem;
 }
 
 h1, h2, h3, h4 {
@@ -78,36 +65,29 @@ input[type="number"]::-webkit-inner-spin-button {
     display: none;
 }
 
-input[type="text"],
-input[type="password"],
-input[type="number"],
-select {
-    padding: var(--element-padding);
-    text-align: center !important;
-    font-size: 16px;
+input[type="text"], input[type="password"], input[type="number"], select {
+    padding: .6rem .8rem;
+    text-align: center;
+    font-size: 1rem;
     color: var(--color);
     border: none;
     outline: none;
-    border: 1px solid var(--border-color);
+    border-bottom: 1px solid var(--border-color);
     border-radius: var(--border-radius);
     background: var(--bg-color);
-}
-
-input[type="text"]::placeholder,
-input[type="password"]::placeholder,
-input[type="number"]::placeholder,
-select > option:disabled {
-    color: var(--color-disabled);
+    font-family: "Inter";
 }
 
 select {
     appearance: none;
     -webkit-appearance: none;
     -moz-appearance: none;
+    height: 2.5rem;
     background-image: url("/static/material-icons/arrow-drop-down.svg");
     background-repeat: no-repeat;
     background-position: right;
     background-size: 1.5rem;
+    padding-right: 1.8rem;
 }
 
 table {
@@ -126,6 +106,12 @@ tr:nth-child(2n+2) > td {
     background: var(--bg-color2);
 }
 
+/*
+Rounded corners on table cells apparently don't work with
+Firefox, so Firefox users won't have rounded corners
+on tables. Can't fix that by myself.
+*/
+
 table tr:first-child th:first-child {
     border-top-left-radius: var(--border-radius);
 }
@@ -179,7 +165,11 @@ th {
     flex-direction: row;
     margin-top: 1rem;
     width: 94%;
-    gap: 2rem;
+    gap: 1rem;
+}
+
+.userinfo {
+    font-size: 1.05rem;
 }
 
 .userinfo > span {
@@ -234,7 +224,7 @@ main {
 }
 
 .footer > div {
-    font-size: 16px;
+    font-size: .95rem;
     margin-top: .15rem;
     margin-bottom: .15rem;
 }
@@ -286,6 +276,15 @@ main {
     gap: 1rem;
 }
 
+.fill {
+    height: 100%;
+    width: 100%;
+}
+
+.fill-vertical {
+    height: 100%;
+}
+
 .buttons {
     display: flex;
     flex-direction: row;
@@ -298,26 +297,24 @@ main {
     display: flex;
     align-items: center;
     justify-content: center;
+    font-family: var(--font-family);
+    text-decoration: none;
+    text-align: center !important;
+    background: var(--bg-color);
+    color: var(--color);
+    font-size: 1rem;
+    padding: .6rem .8rem;
     outline: none;
-    border: 1px solid var(--border-color);
+    border: none;
+    border-bottom: 1px solid var(--border-color);
     border-radius: var(--border-radius);
+    cursor: pointer;
+    user-select: none;
+    box-sizing: content-box;
     width: fit-content;
 }
 
-.button, button, .dropdownchoice {
-    padding: var(--element-padding);
-    font-size: 16px;
-    text-align: center !important;
-    text-decoration: none;
-    color: var(--color);
-    box-sizing: content-box;
-    cursor: pointer;
-    user-select: none;
-    background: var(--bg-color);
-}
-
-.button:hover, button:hover,
-.button:active, button:active {
+.button:hover, button:hover, .button:active, button:active {
     background: var(--bg-hover-color);
 }
 
@@ -325,55 +322,30 @@ main {
     opacity: 40%;
 }
 
-.formheading {
-    margin-bottom: 2rem;
-}
-
-.forminfo {
-    width: fit-content;
-    min-width: 16rem;
+.appform > .forminfo {
+    width: 100%;
     text-align: left;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     gap: 2rem;
-    padding-bottom: .15rem;
-    border-bottom: 1px solid #ffffff20;
 }
 
 .forminfo > span:last-child {
     float: right;
 }
 
-.appform, .appform > * {
-    max-width: 90vw;
-}
-
 .appform > .forminput {
     width: 100%;
     flex-direction: row;
-    justify-content: space-between;
+    justify-content: space-evenly;
     align-items: center;
     flex-wrap: wrap;
     gap: 1rem;
 }
 
-.forminput > input, .forminput > select {
-    width: 100% !important;
-}
-
-.forminput > .keyboard-input, #transfer-recipient {
-    /* the keyboard has a 5px padding */
-    margin-left: 5px !important;
-    margin-right: 5px !important;
-}
-
-.appform > .buttons {
-    margin-top: 1rem;
-}
-
-#statusinfo {
-    margin-top: 1rem;
+.appform > .statusinfo {
+    margin-top: .5rem;
 }
 
 .dropdownmenu {
@@ -384,16 +356,6 @@ main {
     border-radius: var(--border-radius);
 }
 
-#dropdownnope {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100vw;
-    height: 100vh;
-    margin: 0;
-    padding: 0;
-}
-
 .dropdownbutton {
     z-index: 190;
 }
@@ -404,69 +366,70 @@ main {
 }
 
 .dropdownlist {
-    margin-top: 3rem;
     position: absolute;
     display: flex;
     flex-direction: column;
-    border-radius: var(--border-radius);
-    box-shadow: 0 0 .5rem #00000025;
-}
-
-.dropdownlist, #dropdownnope {
-    visibility: hidden;
-    opacity: 0%;
     pointer-events: none;
-}
-
-.dropdownvisible .dropdownlist,
-.dropdownvisible #dropdownnope {
-    opacity: 100%;
-    background: #00000020;
-    visibility: visible;
-    pointer-events: visible;
-    z-index: 100;
+    border-radius: var(--border-radius) !important;
+    z-index: 200;
+    margin-top: 3.2rem;
+    opacity: 0%;
+    transition: opacity 100ms;
+    box-shadow: 0 .25rem 1rem #00000090;
 }
 
 .dropdownchoice {
-    z-index: 200;
+    border-radius: 0 !important;
     margin: 0;
-    text-decoration: none;
+    text-align: center;
+    justify-content: center;
+    background: var(--bg-color2) !important;
+    backdrop-filter: none !important;
     width: initial;
-    min-width: max-content;
-    border-bottom: 1px solid var(--border-color);
-    border-left: 1px solid var(--border-color);
-    border-right: 1px solid var(--border-color);
-}
-
-.dropdownchoice:first-child {
-    border-top: 1px solid var(--border-color);
-    border-top-left-radius: var(--border-radius);
-    border-top-right-radius: var(--border-radius);
-}
-
-.dropdownchoice:last-child {
-    border-bottom: 1px solid var(--border-color);
-    border-bottom-left-radius: var(--border-radius);
-    border-bottom-right-radius: var(--border-radius);
 }
 
 .dropdownchoice:hover {
-    background: var(--bg-hover-color);
+    background: var(--bg-hover-color2) !important;
+}
+
+.dropdownlist :first-child {
+    border-top-left-radius: var(--border-radius) !important;
+    border-top-right-radius: var(--border-radius) !important;
+}
+
+.dropdownlist :last-child {
+    border-bottom-left-radius: var(--border-radius) !important;
+    border-bottom-right-radius: var(--border-radius) !important;
+}
+
+.dropdownvisible .dropdownlist {
+    opacity: 100%;
+    visibility: visible;
+    pointer-events: visible;
 }
 
 .customnumberinput {
-    height: 2.2rem;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    gap: .25rem;
+    height: 2.5rem;
 }
 
 .customnumberinput button {
-    width: 2.2rem !important;
-    height: 2.2rem !important;
+    min-width: 2.5rem !important;
+    width: 2.5rem !important;
     padding: 0;
     margin: 0;
+    height: 100%;
+}
+
+.customnumberinput-minus {
+    border-bottom-right-radius: 0;
+    border-top-right-radius: 0;
+    z-index: 10;
+}
+
+.customnumberinput-plus {
+    border-bottom-left-radius: 0;
+    border-top-left-radius: 0;
+    z-index: 10;
 }
 
 .customnumberinput input[type="number"] {
@@ -475,13 +438,13 @@ main {
     padding: 0;
     margin: 0;
     background: var(--bg-color2);
+    border-radius: 0 !important;
     -webkit-appearance: textfield;
     -moz-appearance: textfield;
     appearance: textfield;
 }
 
 .errortext {
-    font-weight: bold;
     color: var(--color-error);
 }
 
@@ -491,11 +454,6 @@ main {
 
 /* Login */
 
-.userlist-container {
-    flex-grow: 1;
-    padding-bottom: 10vh;
-}
-
 .userlist {
     width: 60%;
     list-style: none;
@@ -505,7 +463,8 @@ main {
 }
 
 .userlist > li {
-    padding: .1rem .6rem;
+    margin-bottom: .5rem;
+    padding: 0 .5rem;
 }
 
 .userlist > li > img {
@@ -518,7 +477,7 @@ main {
 .userlist > li > div {
     flex-grow: 1;
     text-align: center;
-    padding: .7rem 1.1rem;
+    padding: .8rem 1.1rem;
 }
 
 .loginform {
@@ -530,18 +489,6 @@ main {
     margin-top: 0;
 }
 
-#passwordoverlay-container {
-    position: fixed;
-    width: 100vw;
-    height: 100vh;
-    top: 0;
-    right: 0;
-    background: var(--bg-page);
-    align-items: center;
-    padding-top: 10vh;
-    z-index: 200;
-}
-
 /* Drinks List */
 
 .drinks-list {
@@ -558,7 +505,7 @@ main {
 .drinks-list > li > .button {
     width: 100%;
     justify-content: space-between;
-    padding: .7rem 1.1rem;
+    padding: .8rem 1.1rem;
 }
 
 /* Statistics */
@@ -578,19 +525,6 @@ main {
     width: 16rem;
 }
 
-/* Blur */
-
-@supports (backdrop-filter: blur()) {
-    .dropdownvisible #dropdownnope {
-        backdrop-filter: blur(16px);
-    }
-    #passwordoverlay-container {
-        background: #00000020;
-        backdrop-filter: blur(64px); /* fallback */
-        backdrop-filter: blur(128px);
-    }
-}
-
 /* Responsive */
 
 @media only screen and (max-width: 1200px) {
@@ -611,10 +545,9 @@ main {
     }
 }
 
-@media only screen and (max-width: 860px) {
+@media only screen and (max-width: 700px) {
     .userpanel {
         flex-direction: column;
-        gap: 1rem;
     }
     .userlist {
         gap: 0.25rem;
@@ -633,10 +566,7 @@ main {
     }
     .dropdownlist {
         width: 14rem;
-        right: calc(50vw - 7rem); /* regard width */
+        right: calc(50vw - 7rem);
         left: auto;
     }
-    #keyboard {
-        display: none !important;
-    }
 }
diff --git a/static/css/simple-keyboard.css b/app/static/css/simple-keyboard.css
similarity index 100%
rename from static/css/simple-keyboard.css
rename to app/static/css/simple-keyboard.css
diff --git a/static/css/simple-keyboard_custom.css b/app/static/css/simple-keyboard_dark.css
similarity index 83%
rename from static/css/simple-keyboard_custom.css
rename to app/static/css/simple-keyboard_dark.css
index 39da287..e380b77 100644
--- a/static/css/simple-keyboard_custom.css
+++ b/app/static/css/simple-keyboard_dark.css
@@ -6,7 +6,6 @@
     max-width: 100%;
     background: transparent;
     font-family: "Inter";
-    font-size: 16px;
 }
 .simple-keyboard.darkTheme .hg-button {
     height: 50px;
@@ -15,8 +14,8 @@
     align-items: center;
     background: var(--bg-color);
     color: white;
-    border: 1px solid var(--border-color);
-    border-radius: var(--border-radius);
+    border: none;
+    border-bottom: 1px solid var(--border-color);
 }
 .simple-keyboard.darkTheme .hg-button:active,
 .simple-keyboard.darkTheme .hg-button:hover {
diff --git a/static/favicon.ico b/app/static/favicon.ico
similarity index 100%
rename from static/favicon.ico
rename to app/static/favicon.ico
diff --git a/static/favicon.png b/app/static/favicon.png
similarity index 100%
rename from static/favicon.png
rename to app/static/favicon.png
diff --git a/static/fonts/Inter-Bold.ttf b/app/static/fonts/Inter-Bold.ttf
similarity index 100%
rename from static/fonts/Inter-Bold.ttf
rename to app/static/fonts/Inter-Bold.ttf
diff --git a/static/fonts/Inter-Regular.ttf b/app/static/fonts/Inter-Regular.ttf
similarity index 100%
rename from static/fonts/Inter-Regular.ttf
rename to app/static/fonts/Inter-Regular.ttf
diff --git a/static/js/autoreload.js b/app/static/js/autoreload.js
similarity index 100%
rename from static/js/autoreload.js
rename to app/static/js/autoreload.js
diff --git a/static/js/custom_form.js b/app/static/js/custom_form.js
similarity index 100%
rename from static/js/custom_form.js
rename to app/static/js/custom_form.js
diff --git a/static/js/custom_number_input.js b/app/static/js/custom_number_input.js
similarity index 100%
rename from static/js/custom_number_input.js
rename to app/static/js/custom_number_input.js
diff --git a/static/js/logged_out.js b/app/static/js/logged_out.js
similarity index 100%
rename from static/js/logged_out.js
rename to app/static/js/logged_out.js
diff --git a/static/js/login.js b/app/static/js/login.js
similarity index 98%
rename from static/js/login.js
rename to app/static/js/login.js
index 6f62216..cc9274d 100644
--- a/static/js/login.js
+++ b/app/static/js/login.js
@@ -35,7 +35,6 @@
     function show_password_overlay() {
         window.scrollTo(0, 0);
         passwordOverlayElement.classList.remove("nodisplay");
-        passwordInputElement.focus()
     }
     function hide_password_overlay() {
         passwordOverlayElement.classList.add("nodisplay");
diff --git a/app/static/js/main.js b/app/static/js/main.js
new file mode 100644
index 0000000..711aed8
--- /dev/null
+++ b/app/static/js/main.js
@@ -0,0 +1,14 @@
+document.addEventListener("DOMContentLoaded", () => {
+    let dropdownmenuElement = document.getElementById("dropdownmenu");
+    let dropdownmenuButtonElement = document.getElementById("dropdownmenu-button");
+    if (dropdownmenuButtonElement != null) {
+        dropdownmenuButtonElement.addEventListener("click", () => {
+            if (dropdownmenuElement.classList.contains("dropdownvisible")) {
+                dropdownmenuElement.classList.remove("dropdownvisible");
+            }
+            else {
+                dropdownmenuElement.classList.add("dropdownvisible");
+            }
+        })
+    }
+});
diff --git a/static/js/order.js b/app/static/js/order.js
similarity index 100%
rename from static/js/order.js
rename to app/static/js/order.js
diff --git a/static/js/simple-keyboard.js b/app/static/js/simple-keyboard.js
similarity index 100%
rename from static/js/simple-keyboard.js
rename to app/static/js/simple-keyboard.js
diff --git a/static/js/simple-keyboard_configure.js b/app/static/js/simple-keyboard_configure.js
similarity index 100%
rename from static/js/simple-keyboard_configure.js
rename to app/static/js/simple-keyboard_configure.js
diff --git a/static/material-icons/arrow-drop-down.svg b/app/static/material-icons/arrow-drop-down.svg
similarity index 100%
rename from static/material-icons/arrow-drop-down.svg
rename to app/static/material-icons/arrow-drop-down.svg
diff --git a/static/material-icons/menu.svg b/app/static/material-icons/menu.svg
similarity index 100%
rename from static/material-icons/menu.svg
rename to app/static/material-icons/menu.svg
diff --git a/app/templates/baselayout.html b/app/templates/baselayout.html
index 97ac907..5783cf9 100644
--- a/app/templates/baselayout.html
+++ b/app/templates/baselayout.html
@@ -25,7 +25,7 @@
             <div class="flex flex-center">
                 {% translate "An error occured. Please log out and log in again." %}
                 <br>
-                <a class="button" href="/accounts/logout">log out</a>
+                <a href="/accounts/logout">log out</a>
             </div>
             {% endif %}
         </main>
diff --git a/app/templates/deposit.html b/app/templates/deposit.html
index cf3dbc1..bbce3e1 100644
--- a/app/templates/deposit.html
+++ b/app/templates/deposit.html
@@ -8,16 +8,20 @@
 
 {% block headAdditional %}
 <link rel="stylesheet" href="/static/css/simple-keyboard.css">
-<link rel="stylesheet" href="/static/css/simple-keyboard_custom.css">
+<link rel="stylesheet" href="/static/css/simple-keyboard_dark.css">
 {% endblock %}
 
 {% block content %}
-<h1 class="formheading">{% translate "Deposit" %}</h1>
 <form id="customform" class="flex flex-column flex-center appform gap-1rem" action="/api/deposit">
     {% csrf_token %}
+    <h1 class="formheading">{% translate "Deposit" %}</h1>
     <div class="flex forminput">
-        <input type="number" name="depositamount" class="keyboard-input depositamount" max="9999.99" min="1.00" step="0.01" placeholder="{% translate 'Amount' %} ({{ currency_suffix }})" autofocus required>
+        <span>{% translate "Amount" %} {{ currency_suffix }}:</span>
+        <span>
+            <input type="number" name="depositamount" class="keyboard-input" max="9999.99" min="1.00" step="0.01" autofocus required>
+        </span>
     </div>
+    <div id="statusinfo"></div>
     <!-- Virtual Keyboard -->
     <div id="keyboard" class="simple-keyboard" data-layout="numeric"></div>
     <script src="/static/js/simple-keyboard.js"></script>
@@ -27,7 +31,6 @@
         <input type="submit" id="submitbtn" class="button" value='{% translate "confirm" %}'>
     </div>
 </form>
-<div id="statusinfo"></div>
 <script src="/static/js/custom_form.js"></script>
 <script src="/static/js/autoreload.js"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/footer.html b/app/templates/footer.html
index 63b51ec..89d58c6 100644
--- a/app/templates/footer.html
+++ b/app/templates/footer.html
@@ -2,6 +2,6 @@
 <footer class="footer-container">
     <div class="flex flex-row flex-center flex-wrap footer">
         <div>Version {{ app_version }}</div>
-        <div>Copyright (C) 2021-2025, Julian Müller (ChaoticByte)</div>
+        <div>Copyright (C) 2021, Julian Müller (ChaoticByte)</div>
     </div>
 </footer>
\ No newline at end of file
diff --git a/app/templates/order.html b/app/templates/order.html
index 2e5286f..2cae204 100644
--- a/app/templates/order.html
+++ b/app/templates/order.html
@@ -11,31 +11,31 @@
 <div class="flex flex-column flex-center">
 {% if drink and drink.available > 0 and not drink.deleted %}
 {% if user.balance > 0 or user.allow_order_with_negative_balance %}
-    <h1 class="formheading">{% translate "Order" %}</h1>
     <form id="orderform" class="flex flex-column flex-center appform gap-1rem">
         {% csrf_token %}
+        <h1 class="formheading">{% translate "Order" %}</h1>
         <div class="forminfo">
-            <span>{% translate "Drink" %}</span>
+            <span>{% translate "Drink" %}:</span>
             <span>{{ drink.product_name }}</span>
         </div>
         <div class="forminfo">
-            <span>{% translate "Price per Item" %} ({{ currency_suffix }})</span> 
+            <span>{% translate "Price per Item" %} ({{ currency_suffix }}):</span> 
             <span id="priceperdrink" data-drink-price="{% localize off %}{{ drink.price }}{% endlocalize %}">
                 {{ drink.price }}
             </span>
         </div>
         {% if not drink.do_not_count %}
         <div class="forminfo">
-            <span>{% translate "Available" %}</span>
+            <span>{% translate "Available" %}:</span>
             <span>{{ drink.available }}</span>
         </div>
         {% endif %}
         <div class="forminfo">
-            <span>{% translate "Sum" %} ({{ currency_suffix }})</span>
+            <span>{% translate "Sum" %} ({{ currency_suffix }}):</span>
             <span id="ordercalculatedsum">{{ drink.price }}</span>
         </div>
         <div class="flex forminput">
-            <span>{% translate "Count" %}</span>
+            <span>{% translate "Count" %}:</span>
             <span class="flex flex-row customnumberinput">
                 <button type="button" class="customnumberinput-minus" id="numberofdrinks-btn-minus">-</button>
                 {% if drink.do_not_count %}
@@ -48,19 +48,19 @@
                 <button type="button" class="customnumberinput-plus" id="numberofdrinks-btn-plus">+</button>
             </span>
         </div>
+        <div id="statusinfo"></div>
         <input type="hidden" name="drinkid" id="drinkid" value="{{ drink.id }}">
         <div class="buttons">
             <a href="/" class="button">{% translate "cancel" %}</a>
             <input type="submit" id="ordersubmitbtn" class="button" value='{% translate "order" %}'>
         </div>
     </form>
-    <div id="statusinfo"></div>
     <script src="/static/js/order.js"></script>
     <script src="/static/js/custom_number_input.js"></script>
 {% else %}
-    <div class="flex flex-center flex-column">
+    <div class="flex flex-center">
         <p>{% translate "Your balance is too low to order a drink." %}</p>
-        <a href="/" class="button">{% translate "back" %}</a>
+        <a href="/">{% translate "back" %}</a>
     </div>
 {% endif %}            
 {% else %}
diff --git a/app/templates/registration/login.html b/app/templates/registration/login.html
index 657c713..c9ba292 100644
--- a/app/templates/registration/login.html
+++ b/app/templates/registration/login.html
@@ -10,7 +10,7 @@
 
 {% block headAdditional %}
 <link rel="stylesheet" href="/static/css/simple-keyboard.css">
-<link rel="stylesheet" href="/static/css/simple-keyboard_custom.css">
+<link rel="stylesheet" href="/static/css/simple-keyboard_dark.css">
 {% endblock %}
 
 {% block content %}
@@ -19,7 +19,7 @@
 {% endif %}
 <div class="flex flex-column gap-1rem nodisplay" id="passwordoverlay-container">
     <div class="passwordoverlay">
-        <h1 class="formheading">{% translate "Log in" %}</h1>
+        <h1>{% translate "Log in" %}</h1>
         <form method="post" action="{% url 'login' %}" class="flex flex-center loginform">
             {% csrf_token %}
             <input type="text" name="username" autofocus="" autocapitalize="none" autocomplete="username" maxlength="150" required="" id="id_username">
@@ -36,7 +36,7 @@
     <script src="/static/js/simple-keyboard.js"></script>
     <script src="/static/js/simple-keyboard_configure.js"></script>
 </div>
-<div class="flex flex-column flex-center userlist-container">
+<div class="flex flex-column flex-center">
     <h1>{% translate "Choose your account" %}</h1>
     <ul class="flex flex-center flex-wrap userlist">
         {% for user_ in user_list %}
diff --git a/app/templates/supply.html b/app/templates/supply.html
index bcbc3d0..4f656c2 100644
--- a/app/templates/supply.html
+++ b/app/templates/supply.html
@@ -9,21 +9,27 @@
 
 {% block content %}
 {% if user.is_superuser or user.allowed_to_supply %}
-<h1 class="formheading">{% translate "Supply" %}</h1>
 <form id="customform" class="flex flex-column flex-center appform gap-1rem" action="/api/supply">
     {% csrf_token %}
+    <h1 class="formheading">{% translate "Supply" %}</h1>
     <div class="flex forminput">
-        <input type="text" name="supplydescription" placeholder="{% translate 'Description' %}" autofocus required>
+        <span>{% translate "Description" %}:</span>
+        <span>
+            <input type="text" name="supplydescription" autofocus required>
+        </span>
     </div>
     <div class="flex forminput">
-        <input type="number" name="supplyprice" max="9999.99" min="1.00" step="0.01" placeholder="{% translate 'Price' %} ({{ currency_suffix }})" required>
+        <span>{% translate "Price" %} ({{ currency_suffix }}):</span>
+        <span>
+            <input type="number" name="supplyprice" max="9999.99" min="1.00" step="0.01" required>
+        </span>
     </div>
+    <div id="statusinfo"></div>
     <div class="buttons">
         <a href="/" class="button">{% translate "cancel" %}</a>
         <input type="submit" id="submitbtn" class="button" value='{% translate "submit" %}'>
     </div>
 </form>
-<div id="statusinfo"></div>
 <script src="/static/js/custom_form.js"></script>
 <script src="/static/js/custom_number_input.js"></script>
 {% else %}
diff --git a/app/templates/transfer.html b/app/templates/transfer.html
index bf0524b..74c13f4 100644
--- a/app/templates/transfer.html
+++ b/app/templates/transfer.html
@@ -8,37 +8,44 @@
 
 {% block headAdditional %}
 <link rel="stylesheet" href="/static/css/simple-keyboard.css">
-<link rel="stylesheet" href="/static/css/simple-keyboard_custom.css">
+<link rel="stylesheet" href="/static/css/simple-keyboard_dark.css">
 {% endblock %}
 
 {% block content %}
-<h1 class="formheading">{% translate "Transfer Money" %}</h1>
 <form id="customform" class="flex flex-column flex-center appform gap-1rem" action="/api/transfer">
     {% csrf_token %}
+    <h1 class="formheading">{% translate "Transfer Money" %}</h1>
     <div class="flex forminput">
-        <select name="recipientuser" id="transfer-recipient" required>
-            <option value="" selected disabled>Recipient</option>
-            {% for user_ in user_list %}
-            {% if user_.id != user.id %}
-            <option value="{{user_.id}}">
-            {% if user_.first_name %}
-                {% if user_.last_name %}
-                {{ user_.last_name }},
+        <span>{% translate "Recipient" %}:</span>
+        <span>
+            <select name="recipientuser" required>
+                <option></option>
+                {% for user_ in user_list %}
+                {% if user_.id != user.id %}
+                <option value="{{user_.id}}">
+                {% if user_.first_name %}
+                    {% if user_.last_name %}
+                    {{ user_.last_name }},
+                    {% endif %}
+                    {{ user_.first_name }}
+                {% elif user_.last_name %}
+                    {{ user_.last_name }}
+                {% else %}
+                    {{ user_.username }}
                 {% endif %}
-                {{ user_.first_name }}
-            {% elif user_.last_name %}
-                {{ user_.last_name }}
-            {% else %}
-                {{ user_.username }}
-            {% endif %}
-            {% endif %}
-            </option>
-            {% endfor %}
-        </select>
+                {% endif %}
+                </option>
+                {% endfor %}
+            </select>
+        </span>
     </div>
     <div class="flex forminput">
-        <input type="number" name="transferamount" class="keyboard-input" max="{{ user.balance }}" min="0.01" step="0.01" placeholder="{% translate 'Amount' %} ({{ currency_suffix }})" autofocus required>
+        <span>{% translate "Amount" %} {{ currency_suffix }}:</span>
+        <span>
+            <input type="number" name="transferamount" class="keyboard-input" max="{{ user.balance }}" min="0.01" step="0.01" autofocus required>
+        </span>
     </div>
+    <div id="statusinfo"></div>
     <!-- Virtual Keyboard -->
     <div id="keyboard" class="simple-keyboard" data-layout="numeric"></div>
     <script src="/static/js/simple-keyboard.js"></script>
@@ -48,7 +55,6 @@
         <input type="submit" id="submitbtn" class="button" value='{% translate "confirm" %}'>
     </div>
 </form>
-<div id="statusinfo"></div>
 <script src="/static/js/custom_form.js"></script>
 <script src="/static/js/autoreload.js"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/userpanel.html b/app/templates/userpanel.html
index 966f86e..7d2d015 100644
--- a/app/templates/userpanel.html
+++ b/app/templates/userpanel.html
@@ -18,20 +18,19 @@
         <a class="button" href="/deposit">{% translate "Deposit" %}</a>
         <a class="button" href="/accounts/logout">{% translate "Logout" %}</a>
         <div class="dropdownmenu" id="dropdownmenu">
-            <div id="dropdownnope"></div>
             <button class="dropdownbutton" id="dropdownmenu-button"><img src="/static/material-icons/menu.svg"></button>
             <div class="dropdownlist">
-                <a class="dropdownchoice" href="/history">{% translate "History" %}</a>
-                <a class="dropdownchoice" href="/statistics">{% translate "Statistics" %}</a>
+                <a class="button dropdownchoice" href="/history">{% translate "History" %}</a>
+                <a class="button dropdownchoice" href="/statistics">{% translate "Statistics" %}</a>
                 {% if user.is_superuser or user.is_staff %}
-                <a class="dropdownchoice" href="/admin/">Admin Panel</a>
+                <a class="button dropdownchoice" href="/admin/">Admin Panel</a>
                 {% endif %}
-                <a class="dropdownchoice" href="/transfer/">{% translate "Transfer" %}</a>
+                <a class="button dropdownchoice" href="/transfer/">{% translate "Transfer" %}</a>
                 {% if user.is_superuser or user.allowed_to_supply %}
-                <a class="dropdownchoice" href="/supply/">{% translate "Supply" %}</a>
+                <a class="button dropdownchoice" href="/supply/">{% translate "Supply" %}</a>
                 {% endif %}
-                <a class="dropdownchoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
+                <a class="button dropdownchoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/data/Caddyfile b/data/Caddyfile
index d790c4e..c5bbc58 100644
--- a/data/Caddyfile
+++ b/data/Caddyfile
@@ -9,8 +9,7 @@
 
 {$CADDY_HOSTS} {
 	# the tls certificates
-	# tls {$DATADIR}/tls/server.pem {$DATADIR}/tls/server-key.pem
-	tls internal
+	tls {$DATADIR}/tls/server.pem {$DATADIR}/tls/server-key.pem
 	route {
 		# profile pictures
 		file_server /profilepictures/* {
@@ -18,11 +17,7 @@
 		}
 		# static files
 		file_server /static/* {
-			root {$ROOTDIR}
-		}
-		# django static files
-		file_server /django_static/* {
-			root {$DATADIR}/django_static/..
+			root {$DATADIR}/static/..
 		}
 		# favicon
 		redir /favicon.ico /static/favicon.ico
diff --git a/project/settings.py b/project/settings.py
index 56ff5fb..a5362ca 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -149,8 +149,8 @@ LOCALE_PATHS = [
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.1/howto/static-files/
 
-STATIC_URL = "django_static/"
-STATIC_ROOT = BASE_DIR / "data" / "django_static"
+STATIC_URL = "static/"
+STATIC_ROOT = BASE_DIR / "data" / "static"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
diff --git a/requirements.txt b/requirements.txt
index ceb35b8..2be275b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django~=4.2
-psycopg2~=2.9
-uvicorn[standard]~=0.27
+Django~=4.1
+psycopg2~=2.9.5
+uvicorn~=0.20.0
 PyYAML~=6.0
diff --git a/scripts/_bootstrap.py b/scripts/_bootstrap.py
index c162c03..142781e 100755
--- a/scripts/_bootstrap.py
+++ b/scripts/_bootstrap.py
@@ -14,7 +14,7 @@ from time import sleep
 from yaml import safe_load
 
 
-banner = r""" ___        _        _
+banner = """ ___        _        _
 |   \  _ _ (_) _ _  | |__ ___  ___
 | |) || '_|| || ' \ | / /(_-< |___|
 |___/ |_|  |_||_||_||_\_\/__/
@@ -131,7 +131,6 @@ if __name__ == "__main__":
         ["./venv/bin/python3", "./manage.py", "migrate", "--noinput"], env=os.environ).wait()
     # Caddy configuration via env
     environment_caddy = os.environ
-    environment_caddy["ROOTDIR"] = str(base_directory.absolute())
     environment_caddy["DATADIR"] = str(data_directory.absolute())
     environment_caddy["CADDY_HOSTS"] = ", ".join(config["caddy"]["hosts"])
     environment_caddy["HTTP_PORT"] = str(config["caddy"]["http_port"])
diff --git a/start.sh b/start.sh
index cd50964..ab9ea5b 100755
--- a/start.sh
+++ b/start.sh
@@ -11,6 +11,6 @@ chmod -c -R g-w,o-rwx .gitignore
 
 export PYTHONPATH="$basedir"
 export DJANGO_SETTINGS_MODULE="project.settings"
-export APP_VERSION="22"
+export APP_VERSION="19"
 
 exec ./scripts/_bootstrap.py "$@"
diff --git a/static/js/main.js b/static/js/main.js
deleted file mode 100644
index 5fab451..0000000
--- a/static/js/main.js
+++ /dev/null
@@ -1,21 +0,0 @@
-document.addEventListener("DOMContentLoaded", () => {
-    let dropdownmenuElement = document.getElementById("dropdownmenu");
-    let dropdownmenuButtonElement = document.getElementById("dropdownmenu-button");
-    let dropdownmenuNopeElement = document.getElementById("dropdownnope");
-    function toggleDropDown() {
-        if (dropdownmenuElement.classList.contains("dropdownvisible")) {
-            dropdownmenuElement.classList.remove("dropdownvisible");
-            dropdownmenuNopeElement.classList.remove("dropdownvisible");
-        } else {
-            dropdownmenuElement.classList.add("dropdownvisible");
-            dropdownmenuNopeElement.classList.add("dropdownvisible");
-        }
-    }
-    if (dropdownmenuButtonElement != null) {
-        dropdownmenuButtonElement.addEventListener("click", toggleDropDown);
-        dropdownmenuNopeElement.addEventListener("click", () => {
-            dropdownmenuElement.classList.remove("dropdownvisible");
-            dropdownmenuNopeElement.classList.remove("dropdownvisible");
-        })
-    }
-});