diff --git a/src/index.html b/src/index.html
index 6b38901..e1faf23 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,34 +3,56 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Skynet Self Service</title>
-    <link rel="icon" type="image/png" href="./images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="./stylesheets/index.css"/>
+    <link href="./images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="./stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="./images/sharky.svg" alt="Sharky, our mascot" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="./images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
-        <h2><a href="./signup.html">Sign-up</a></h2>
-        <p>Please use this if you have yet to activate an account on Skynet before.</p>
-        <h2><a href="./password.html">Change Password</a></h2>
-        <p>Please use this service to change your skynet password</p>
-        <h2><a href="./modify.html">Account modification</a></h2>
-        <p>
-          Please use this service to modify your user data (email, login ssh key, etc.)
-        </p>
-        <h2><a href="./recovery/username.html">Forgot your username?</a></h2>
-        <p>
-          Please use this service to get a reminder email with your skynet username
-        </p>
-        <h2>
-          <a href="./recovery/password.html">Forgot your password?</a>
-        </h2>
-        <p>
-          Please use this service to reset your password.
-        </p>
+        <section>
+          <h2>
+            <a href="./signup.html">Sign-up</a>
+          </h2>
+          <p>
+            Please use this if you have yet to activate an account on Skynet before.
+          </p>
+        </section>
+        <section>
+          <h2>
+            <a href="./password.html">Change Password</a>
+          </h2>
+          <p>
+            Please use this service to change your Skynet password
+          </p>
+        </section>
+        <section>
+          <h2>
+            <a href="./modify.html">Account modification</a>
+          </h2>
+          <p>
+            Please use this service to modify your user data (email, login ssh key, etc.)
+          </p>
+        </section>
+        <section>
+          <h2>
+            <a href="./recovery/username.html">Forgot your username?</a>
+          </h2>
+          <p>
+            Please use this service to get a reminder email with your Skynet username
+          </p>
+        </section>
+        <section>
+          <h2>
+            <a href="./recovery/password.html">Forgot your password?</a>
+          </h2>
+          <p>
+            Please use this service to reset your password.
+          </p>
+        </section>
       </main>
       <footer class="page-footer">
         UL Computer Society 2023-<span id="year">2023</span>
diff --git a/src/modify.html b/src/modify.html
index c64736d..7a7220a 100644
--- a/src/modify.html
+++ b/src/modify.html
@@ -3,33 +3,35 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Modify Account</title>
-    <link rel="icon" type="image/png" href="./images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="./stylesheets/index.css"/>
+    <link href="./images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="./stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="./images/sharky.svg" alt="Picture of Sharky, the mascot of skynet" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="./images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <h2>User modification page</h2>
-        <p>Use this page to modify your account. Please remember to select a field before submitting the form</p>
+        <p>
+          Modify details of your Skynet account.
+        </p>
         <form id="reset">
           <table id="table">
             <tr>
               <td><label for="user">Username</label></td>
-              <td><input type="text" id="user" name="user"/> <br/></td>
+              <td><input id="user" name="user" type="text"/> <br/></td>
             </tr>
             <tr>
               <td><label for="pass">Password</label></td>
-              <td><input type="password" id="pass" name="pass"/> <br/></td>
+              <td><input id="pass" name="pass" type="password"/> <br/></td>
             </tr>
             <tr>
               <td><label for="field">Field</label></td>
               <td>
-                <select onchange="selectField()" id="field">
-                  <option value="" selected="selected">Please select an option</option>
+                <select id="field" onchange="selectField()">
+                  <option selected="selected" value="">Please select an option</option>
                   <option value="mail">Email</option>
                   <option value="sshPublicKey">SSH key</option>
                   <option value="cn">First name & Surname</option>
@@ -40,7 +42,7 @@
             </tr>
             <tr>
               <td><label for="value">Value</label></td>
-              <td><input type="text" id="value" name="value"/> <br/></td>
+              <td><input id="value" name="value" type="text"/> <br/></td>
             </tr>
             <tr>
               <td colspan="2"><input type="Submit" value="Submit"/></td>
diff --git a/src/password.html b/src/password.html
index 6362e44..9b53099 100644
--- a/src/password.html
+++ b/src/password.html
@@ -3,35 +3,37 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Password reset</title>
-    <link rel="icon" type="image/png" href="./images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="./stylesheets/index.css"/>
+    <link href="./images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="./stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="./images/sharky.svg" alt="Picture of Sharky, the mascot of skynet" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="./images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <h2>Password Change</h2>
-        <p>Please use this page to change your Skynet password.</p>
+        <p>
+          Change your Skynet password.
+        </p>
         <form id="reset">
           <table id="table">
             <tr>
               <td><label for="user">Username</label></td>
-              <td><input type="text" id="user" name="user"/> <br/></td>
+              <td><input id="user" name="user" type="text"/> <br/></td>
             </tr>
             <tr>
               <td><label for="pass">Old Password</label></td>
-              <td><input type="password" id="pass" name="pass"/> <br/></td>
+              <td><input id="pass" name="pass" type="password"/> <br/></td>
             </tr>
             <tr>
               <td><label for="newPW1">New Password</label></td>
-              <td><input type="password" id="newPW1" name="newPW"/> <br/></td>
+              <td><input id="newPW1" name="newPW" type="password"/> <br/></td>
             </tr>
             <tr>
               <td><label for="newPW2">Confirm</label></td>
-              <td><input type="password" id="newPW2" name="newPWConfirm"/> <br/></td>
+              <td><input id="newPW2" name="newPWConfirm" type="password"/> <br/></td>
             </tr>
             <tr>
               <td colspan="2"><input type="Submit" value="Submit"/></td>
diff --git a/src/recovery/password.html b/src/recovery/password.html
index b3136f0..90ce4ab 100644
--- a/src/recovery/password.html
+++ b/src/recovery/password.html
@@ -3,30 +3,32 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Account Recovery</title>
-    <link rel="icon" type="image/png" href="../images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="../stylesheets/index.css"/>
+    <link href="../images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="../stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="../images/sharky.svg" alt="Sharky, our mascot" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="../images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <h2>Forgot Password</h2>
-        <p>Please use this page to request a password reset link to your linked email.</p>
+        <p>
+          Request a password reset sent to your linked email.
+        </p>
         <form id="recovery">
           <table id="table">
             <tr>
               <td><label for="username">Username</label></td>
-              <td><input type="text" id="username" name="username"/> <br/></td>
+              <td><input id="username" name="username" type="text"/> <br/></td>
             </tr>
             <tr>
               <td>Or<br/></td>
             </tr>
             <tr>
               <td><label for="email">Email</label></td>
-              <td><input type="text" id="email" name="email"/> <br/></td>
+              <td><input id="email" name="email" type="text"/> <br/></td>
             </tr>
             <tr>
               <td colspan="2"><input type="submit" value="submit"/></td>
@@ -42,7 +44,7 @@
             listener.preventDefault();
 
             // reset teh form status
-            document.getElementById('formStatus').innerHTML = "";
+            document.getElementById('formStatus').innerHTML = "<span style='background-color: green; color: white'>Please wait.</span>";
 
             const formData = new FormData(formEl);
             const username = formData.get('username').trim();
diff --git a/src/recovery/password_reset.html b/src/recovery/password_reset.html
index 7fcfa26..7884700 100644
--- a/src/recovery/password_reset.html
+++ b/src/recovery/password_reset.html
@@ -3,23 +3,25 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Account Recovery</title>
-    <link rel="icon" type="image/png" href="../images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="../stylesheets/index.css"/>
+    <link href="../images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="../stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="../images/sharky.svg" alt="Sharky, our mascot" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="../images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <h1>Password Recovery</h1>
-        <p>Please enter a new password for your skynet account below</p>
+        <p>
+          Enter a new password for your Skynet account below.
+        </p>
         <form id="reset">
           <label for="pass1">Password</label>
-          <input type="password" id="pass1" name="password"/> <br/>
+          <input id="pass1" name="password" type="password"/> <br/>
           <label for="pass2">Confirm</label>
-          <input type="password" id="pass2" name="confirm"/> <br/>
+          <input id="pass2" name="confirm" type="password"/> <br/>
           <input type="submit"/>
         </form>
         <p id="formStatus"></p>
@@ -34,7 +36,7 @@
             listener.preventDefault();
 
             // reset
-            document.getElementById('formStatus').innerHTML = "";
+            document.getElementById('formStatus').innerHTML = "<span style='background-color: green; color: white'>Please wait.</span>";
 
             const formData = new FormData(formEl);
             const pass = formData.get("password");
diff --git a/src/recovery/ssh-request.html b/src/recovery/ssh-request.html
index e6ab366..0532f31 100644
--- a/src/recovery/ssh-request.html
+++ b/src/recovery/ssh-request.html
@@ -3,22 +3,22 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Account Recovery</title>
-    <link rel="icon" type="image/png" href="../images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="../stylesheets/index.css"/>
+    <link href="../images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="../stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="../images/sharky.svg" alt="Sharky, our mascot" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="../images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <h1>SSH key recovery</h1>
         <form id="form">
           <label for="user">Username</label>
-          <input type="text" id="user" name="user"/> <br/>
+          <input id="user" name="user" type="text"/> <br/>
           <label for="mail">Email</label>
-          <input type="email" id="mail" name="mail"/> <br/>
+          <input id="mail" name="mail" type="email"/> <br/>
           <input type="submit"/>
         </form>
         <p id="formStatus"></p>
diff --git a/src/recovery/username.html b/src/recovery/username.html
index 4d60151..72cc57f 100644
--- a/src/recovery/username.html
+++ b/src/recovery/username.html
@@ -3,24 +3,26 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Account Recovery</title>
-    <link rel="icon" type="image/png" href="../images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="../stylesheets/index.css"/>
+    <link href="../images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="../stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="../images/sharky.svg" alt="Sharky, our mascot" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="../images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <div class="boxes">
           <h2>Forgot Username</h2>
-          <p>Please use this page to get a reminder email with your skynet username in it.</p>
+          <p>
+            Get a reminder email of your Skynet username.
+          </p>
           <form id="reset">
             <table id="table">
               <tr>
                 <td><label for="email">Email Address</label></td>
-                <td><input type="text" id="email" name="email"/> <br/></td>
+                <td><input id="email" name="email" type="text"/> <br/></td>
               </tr>
               <tr>
                 <td colspan="2"><input type="Submit" value="Submit"/></td>
@@ -35,6 +37,10 @@
 
           function formHandler(listener) {
             listener.preventDefault();
+
+            // reset
+            document.getElementById('formStatus').innerHTML = "<span style='background-color: green; color: white'>Please wait.</span>";
+
             const formData = new FormData(formEl);
             const email = formData.get("email");
             const object = {email: email};
diff --git a/src/register.html b/src/register.html
index ba6d186..eabd5e9 100644
--- a/src/register.html
+++ b/src/register.html
@@ -3,32 +3,35 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Skynet Register</title>
-    <link rel="icon" type="image/png" href="./images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="./stylesheets/index.css"/>
+    <link href="./images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="./stylesheets/index.css" rel="stylesheet" type="text/css"/>
   </head>
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="./images/sharky.svg" alt="Picture of Sharky, the mascot of skynet" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="./images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <h2>Register</h2>
-        <p>Thank you for signing up for your free skynet account. Please complete the process by filling in the form
-          below</p>
+        <p>
+          Thank you for signing up for your Skynet account.
+          <br/>
+          Please complete the process by filling in the form below.
+        </p>
         <form id="register">
           <table id="table">
             <tr>
               <td><label for="user">Username</label></td>
-              <td><input type="text" id="user" name="user"/> <br/></td>
+              <td><input id="user" name="user" type="text"/> <br/></td>
             </tr>
             <tr>
               <td><label for="pass">Password</label></td>
-              <td><input type="password" id="pass" name="pass" minlength="8" maxlength="254"/> <br/></td>
+              <td><input id="pass" maxlength="254" minlength="8" name="pass" type="password"/> <br/></td>
             </tr>
             <tr>
               <td><label for="confirm">Confirm</label></td>
-              <td><input type="password" id="confirm" name="confirm"/></td>
+              <td><input id="confirm" name="confirm" type="password"/></td>
             </tr>
             <tr>
               <td colspan="2"><input type="Submit" value="Submit"/></td>
diff --git a/src/signup.html b/src/signup.html
index 7c90be9..6797d51 100644
--- a/src/signup.html
+++ b/src/signup.html
@@ -3,8 +3,8 @@
   <head>
     <meta charset="UTF-8"/>
     <title>Skynet Sign-up</title>
-    <link rel="icon" type="image/png" href="images/favicon/favicon-16x16.png"/>
-    <link rel="stylesheet" type="text/css" href="stylesheets/index.css"/>
+    <link href="images/favicon/favicon-16x16.png" rel="icon" type="image/png"/>
+    <link href="stylesheets/index.css" rel="stylesheet" type="text/css"/>
     <style>
       /* Taken from the W3 schools loader tutorial */
       .loader {
@@ -17,16 +17,6 @@
         animation: spin 20s linear;
       }
 
-      /* Safari */
-      @-webkit-keyframes spin {
-        0% {
-          -webkit-transform: rotate(0deg);
-        }
-        100% {
-          -webkit-transform: rotate(360deg);
-        }
-      }
-
       @keyframes spin {
         0% {
           transform: rotate(0deg);
@@ -40,21 +30,19 @@
   <body>
     <div class="wrapper">
       <header class="page-header">
-        <img src="./images/sharky.svg" alt="Picture of Sharky, the mascot of skynet" width="145" height="81.56"/>
-        <h1>Skynet self service</h1>
+        <img alt="Sharky, our mascot" height="81.56" src="./images/sharky.svg" width="145"/>
+        <h1>Skynet Self Service</h1>
       </header>
       <main class="page-body">
         <h2>Welcome to Skynet</h2>
         <p>
-          Skynet is a server cluster that the UL Computer Society runs. If you previously had an account and need to
-          activate <br/>
-          it please click <a href="./modify.html">here</a> to set a contact email address for your account. IF you are a
-          new <br/>
-          user, please fill in the form below with the email that you use on ul wolves.
+          If you previously had an account please <a href="./modify.html">set your email</a> to be the same as UL Wolves.
+          <br/>
+          If you are a new user, please fill in the form below with the email that you use on ul wolves.
         </p>
         <form id="register">
           <label for="mail">Email address</label>
-          <input type="email" id="mail" name="email"/> <br/>
+          <input id="mail" name="email" type="email"/> <br/>
           <input type="submit" value="Submit"/>
         </form>
         <p id="formStatus"></p>
diff --git a/src/stylesheets/index.css b/src/stylesheets/index.css
index 60e7c15..3ca47c5 100644
--- a/src/stylesheets/index.css
+++ b/src/stylesheets/index.css
@@ -60,16 +60,19 @@ html, body {
   box-sizing: border-box;
   height: 100%;
 }
+
 .wrapper {
   box-sizing: border-box;
   min-height: 100%;
   display: flex;
   flex-direction: column;
 }
+
 .page-header, .page-footer {
   flex-grow: 0;
   flex-shrink: 0;
 }
+
 .page-body {
   flex-grow: 1;
 }
\ No newline at end of file
