diff --git a/application/app/templates/registration/login.html b/application/app/templates/registration/login.html
index c0179b4..14dc819 100644
--- a/application/app/templates/registration/login.html
+++ b/application/app/templates/registration/login.html
@@ -71,12 +71,12 @@
                         
                     {% if user_.first_name %}
 
-                        {{ user_.first_name }}
-
                         {% if user_.last_name %}
-                            {{ user_.last_name }}
+                            {{ user_.last_name }},
                         {% endif %}
 
+                        {{ user_.first_name }}
+
                     {% else %}
                         {{ user_.username }}
                     {% endif %}
diff --git a/lib/env.sh b/lib/env.sh
index 9eeb667..d11c933 100644
--- a/lib/env.sh
+++ b/lib/env.sh
@@ -2,5 +2,5 @@
 
 export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt"
 export STATIC_FILES="$(pwd)/static/"
-export APP_VERSION="9"
+export APP_VERSION="10"
 export PYTHONPATH="$(pwd)/packages/"
diff --git a/static/css/login.css b/static/css/login.css
index 8a7fb03..346b4f9 100644
--- a/static/css/login.css
+++ b/static/css/login.css
@@ -70,9 +70,12 @@ form input[type="password"], form input[type="text"] {
     font-size: 1rem;
     margin: .1rem 0;
 }
+form .horizontalButtonList {
+    margin-top: 1.5rem;
+}
 .pinpad {
-    margin-top: 3rem;
-    margin-bottom: 2rem;
+    margin-top: 1.5rem;
+    margin-bottom: 0;
     display: flex;
     flex-direction: column;
     align-items: center;
diff --git a/static/js/login.js b/static/js/login.js
index 0f11ba0..df54187 100644
--- a/static/js/login.js
+++ b/static/js/login.js
@@ -1,4 +1,4 @@
-{
+(() => {
 
     // Define variables
 
@@ -84,4 +84,4 @@
         }
     }
 
-}
\ No newline at end of file
+})()
\ No newline at end of file