diff --git a/website/login.php b/website/login.php
index d67c409..9211818 100644
--- a/website/login.php
+++ b/website/login.php
@@ -1,126 +1,35 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <link rel="stylesheet" type="text/css" href="styles/index.css">
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-		<script src="js/dobPicker.min.js"></script>
-    <meta charset="utf-8">
-    <title>MyHyvesbook+</title>
-  </head>
-  <body>
-    <div>
-      <img style="width:50%;margin-left:25%" src="img/top-logo.png" alt="MyHyvesbook+">
-    </div>
+    <head>
+        <link rel="stylesheet" type="text/css" href="styles/index.css">
+        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    		<script src="js/dobPicker.min.js"></script>
+        <meta charset="utf-8">
+        <title>MyHyvesbook+</title>
+    </head>
+    <body>
+        <div>
+            <img style="width:50%;margin-left:25%" src="img/top-logo.png" alt="MyHyvesbook+">
+        </div>
 
-    <form action="/profile.php" method="post">
-      <h1>Welkom bij MyHyvesbook+ </h1>
-      <div class="login_containerlogin">
-        <label><b>Gebruikersnaam</b></label>
-        <input type="text" placeholder="Voer je gebruikersnaam in" name="uname"
-        pattern=".{6,}" title="Moet zes of meer karakters zijn" required>
-      </div>
+        <form action="../profile.php" method="post">
+            <h1>Welkom bij MyHyvesbook+</h1>
+            <div class="login_containerlogin">
+                <label><b>Gebruikersnaam</b></label>
+                <input type="text" placeholder="Voer uw gebruikersnaam in" name="uname"
+                pattern=".{6,}" title="Moet 6 of meer karakters bevatten" required>
+            </div>
 
-      <div class="login_containerlogin">
-        <label><b>Wachtwoord</b></label>
-        <input type="password" placeholder="Voer je wachtwoord in" name="psw"
-        pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}"
-        title="Moet miniaal 1 cijfer, 1 hoofdletter en kleine letter hebben en minstens 8 of meer karakters zijn" required>
-      </div>
+            <div class="login_containerlogin">
+                <label><b>Wachtwoord</b></label>
+                <input type="password" placeholder="Voer uw wachtwoord in" name="psw"
+                pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}"
+                title="Moet minimaal 1 cijfer, hoofdletter en kleine letter bevatten en minstens 8 karakters lang zijn" required>
+            </div>
 
-      <div class="login_containerlogin">
-        <input type="submit" value="Login" name="Submit" id="frm1_submit" />
-      </div>
-    </form>
-
-    <div class="login_containerlogin">
-      <button onclick="document.getElementById('id01').style.display='block'">Registreer</button>
-    </div>
-
-    <div class="login_containerregister">
-      <div id="id01" class="modal">
-      <span onclick="document.getElementById('id01').style.display='none'"
-      class="close" title="Close Modal">&times;</span>
-
-      <!-- Register Content -->
-        <form class="modal-content animate" action="/profile.php" onsubmit="return passwordfunction()" method="post">
-          <h2>Registreer je account</h2>
-
-          <div class="login_containerregister">
-            <label><b>Naam</b></label>
-            <input type="text" placeholder="Voer je naam in" name="name"
-            pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Achternaam</b></label>
-            <input type="text" placeholder="Voer je achternaam in" name="surname"
-            pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Geboortedatum</b></label>
-            <!-- These are the select elements we will target -->
-        		<select id="dobday" title="Voer een dag in"required></select>
-        		<select id="dobmonth" title="Voer een maand in"required></select>
-        		<select id="dobyear" title="Voer een jaar in"required></select>
-        		<!-- And here's the library being called! -->
-        		<script>
-        			$(document).ready(function() {
-        				$.dobPicker({
-        					daySelector: '#dobday', /* Required */
-        					monthSelector: '#dobmonth', /* Required */
-        					yearSelector: '#dobyear', /* Required */
-        					dayDefault: 'Dag', /* Optional */
-        					monthDefault: 'Maand', /* Optional */
-        					yearDefault: 'Jaar', /* Optional */
-        					minimumAge: 12, /* Optional */
-        					maximumAge: 80 /* Optional */
-        				});
-        			});
-        		</script>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Gebruikersnaam</b></label>
-            <input type="text" placeholder="Voer je gebruikersnaam in" name="username"
-            pattern=".{6,}" title="Moet meer dan 6 karakers zijn" required>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Wachtwoord</b></label>
-            <input type="password" placeholder="Voer je wachtwoord in" name="password"
-            pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" id="password"
-            title="Moet miniaal 1 cijfer, 1 hoofdletter en kleine letter hebben en minstens 8 of meer karakters zijn" required>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Herhaal wachtwoord</b></label>
-            <input type="password" placeholder="Herhaal wachtwoord" name="confirmpassword"
-            pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" id="confirmpassword"
-            title="Herhaal wachtwoord" required>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Straatnaam</b></label>
-            <input type="text" placeholder="Voer jouw straatnaam in" name="name"
-            pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Straatnummer</b></label>
-            <input type="text" placeholder="Voer jouw straatnummer in" name="name"
-            pattern="[1-9][0-9]{0,}" title="Moet alleen nummers zijn" required>
-          </div>
-
-          <div class="login_containerregister">
-            <label><b>Email</b></label>
-            <input type="email" placeholder="Voer je email in" id="email"
-            title="Voer een geldige email in" required>
-          </div>
-
-          <div class="login_containerregister">
-            <input type="submit" value="Registreer je account" name="Submit" id="frm1_submit" />
-          </div>
+            <div class="login_containerlogin">
+                <input type="submit" value="Login" name="Submit" id="frm1_submit" />
+            </div>
         </form>
 
         <div class="login_containerlogin">
@@ -134,18 +43,18 @@
 
                 <!-- Register Content -->
                 <form class="modal-content animate" action="../profile.php" onsubmit="return passwordfunction()" method="post">
-                    <h2>Registreer je account</h2>
+                    <h2>Registreer uw account</h2>
 
                     <div class="login_containerregister">
                         <label><b>Naam</b></label>
-                        <input type="text" placeholder="Voer je naam in" name="name"
-                        pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
+                        <input type="text" placeholder="Voer uw naam in" name="name"
+                        pattern="[A-Za-z]{1,}" title="Mag alleen letters bevatten" required>
                     </div>
 
                     <div class="login_containerregister">
                         <label><b>Achternaam</b></label>
-                        <input type="text" placeholder="Voer je achternaam in" name="surname"
-                        pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
+                        <input type="text" placeholder="Voer uw achternaam in" name="surname"
+                        pattern="[A-Za-z]{1,}" title="Mag alleen letters bevatten" required>
                     </div>
 
                     <div class="login_containerregister">
@@ -173,15 +82,15 @@
 
                     <div class="login_containerregister">
                         <label><b>Gebruikersnaam</b></label>
-                        <input type="text" placeholder="Voer je gebruikersnaam in" name="username"
-                        pattern=".{6,}" title="Moet meer dan 6 karakers zijn" required>
+                        <input type="text" placeholder="Voer uw gebruikersnaam in" name="username"
+                        pattern=".{6,}" title="Moet minstens 6 karakters bevatten" required>
                     </div>
 
                     <div class="login_containerregister">
                         <label><b>Wachtwoord</b></label>
-                        <input type="password" placeholder="Voer je wachtwoord in" name="password"
+                        <input type="password" placeholder="Voer uw wachtwoord in" name="password"
                         pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" id="password"
-                        title="Moet miniaal 1 cijfer, 1 hoofdletter en kleine letter hebben en minstens 8 of meer karakters zijn" required>
+                        title="Moet minimaal 1 cijfer, hoofdletter en kleine letter bevatten en minstens 8 karakters bevatten" required>
                     </div>
 
                     <div class="login_containerregister">
@@ -193,24 +102,24 @@
 
                     <div class="login_containerregister">
                         <label><b>Straatnaam</b></label>
-                        <input type="text" placeholder="Voer jouw straatnaam in" name="name"
-                        pattern="[A-Za-z]{1,}" title="Moet alleen letters zijn" required>
+                        <input type="text" placeholder="Voer uw straatnaam in" name="name"
+                        pattern="[A-Za-z]{1,}" title="Mag alleen letters bevatten" required>
                     </div>
 
                     <div class="login_containerregister">
                         <label><b>Straatnummer</b></label>
-                        <input type="text" placeholder="Voer jouw straatnummer in" name="name"
-                        pattern="[1-9][0-9]{0,}" title="Moet alleen nummers zijn" required>
+                        <input type="text" placeholder="Voer uw straatnummer in" name="name"
+                        pattern="[1-9][0-9]{0,}" title="Mag alleen nummers bevatten" required>
                     </div>
 
                     <div class="login_containerregister">
                         <label><b>Email</b></label>
-                        <input type="email" placeholder="Voer je email in" id="email"
+                        <input type="email" placeholder="Voer uw email in" id="email"
                         title="Voer een geldige email in" required>
                     </div>
 
                     <div class="login_containerregister">
-                        <input type="submit" value="Registreer je account" name="Submit" id="frm1_submit" />
+                        <input type="submit" value="Registreer uw account" name="Submit" id="frm1_submit" />
                     </div>
                 </form>
             </div>
@@ -242,8 +151,8 @@
             document.getElementById("password").style.borderColor = "red";
             document.getElementById("confirmpassword").style.borderColor = "red";
             passwordmatching = false;
-            confirmpassword.setCustomValidity("Wachwoord match niet")
+            confirmpassword.setCustomValidity("Wachtwoorden matchen niet")
         }
         return passwordmatching;
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/website/styles/adminpanel.css b/website/styles/adminpanel.css
index f22de20..e761592 100644
--- a/website/styles/adminpanel.css
+++ b/website/styles/adminpanel.css
@@ -1,15 +1,25 @@
 .admin-panel {
     margin: auto;
-    background-color: white;
-    border-radius: 10px;
-    padding: 15px;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+    min-width: 800px;
+}
+
+.admin-title {
+    margin: 10px;
+    padding-bottom: 5px;
+    border-bottom: 4px solid #845663;
+}
+
+.admin-panel input[type="radio"], input[type="checkbox"] {
+    height: auto;
 }
 
 .admin-actions {
     display: inline-block;
-    margin: 10px;
+    padding: 8px;
     vertical-align: top;
+    border-radius: 10px;
+    border: 4px solid #845663;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
 }
 
 .admin-searchbar {
@@ -19,8 +29,6 @@
 }
 
 .admin-searchinput {
-    border: 2px solid #B78996;
-    border-radius: 2px;
     margin-bottom: 10px;
 }
 
@@ -31,7 +39,6 @@
     margin-right: 100px;
 }
 
-
 .admin-users {
     margin: 10px;
 }
@@ -57,7 +64,3 @@
 .usertable tr:hover {
     background-color: #f5f5f5;
 }
-
-/*div {
-    border: 1px solid black;
-}*/
diff --git a/website/styles/footer.css b/website/styles/footer.css
index 2092a7b..53e28f1 100644
--- a/website/styles/footer.css
+++ b/website/styles/footer.css
@@ -9,4 +9,5 @@ footer p {
     padding: 5px;
 
     font-size: 14px;
-}
+    color: #dddddd;
+}
\ No newline at end of file
diff --git a/website/styles/profile.css b/website/styles/profile.css
index 1ac9a2b..7c6218c 100644
--- a/website/styles/profile.css
+++ b/website/styles/profile.css
@@ -49,12 +49,12 @@
 
 /* fullscreen */
 .post-box {
-    width: calc(25% - 68px);
+    width: calc(25% - 69px);
 }
 
 @media only screen and (max-width: 1500px) {
     .post-box {
-        width: calc(50% - 67px);
+        width: calc(50% - 68px);
     }
 }
 
diff --git a/website/styles/settings.css b/website/styles/settings.css
index 751d0dc..9a2c753 100644
--- a/website/styles/settings.css
+++ b/website/styles/settings.css
@@ -1,10 +1,11 @@
 .settings input,
-.settings textarea{
+.settings textarea {
     margin: 5px;
+    resize: none;
 }
 
 .settings label {
-    width: 125px;
+    width: 175px;
     display: inline-block;
     text-align: right;
 }
@@ -16,4 +17,12 @@
 .settings input[type="email"],
 .settings textarea {
     width: 200px;
+}
+
+.settings textarea {
+    width: 400px;
+}
+
+.settings label[for="bio"] {
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index 2723e40..b789aad 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -2,7 +2,6 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <link rel="stylesheet" type="text/css" href="astyle.css">
         <title>Admin Panel</title>
         <script type="text/javascript">
         function checkAll(allbox) {
@@ -18,10 +17,13 @@
     </head>
     <body>
         <div class="content">
-            <div class="admin-panel">
-                <form action="index.html" method="post">
+            <div class="platform admin-panel">
+                <div class="admin-title">
+                    <h1>User Management Panel</h1>
+                </div> <br>
+                <form action="admin.php" method="post">
                 <div class="admin-options">
-                    <form action="index.html" method="post">
+                    <form action="admin.php" method="post">
                         <div class="admin-searchbar">
                             <h2>Search</h2>
                             <input type="text" name="search" class="admin-searchinput"> <br>
@@ -35,7 +37,7 @@
                         </div>
                     </form>
                         <div class="admin-actions">
-                            <h2>Actions: </h2>
+                            <h2>Batch Actions: </h2>
                             <input type="radio" name="actions" value="mute"> Mute <br>
                             <input type="radio" name="actions" value="ban"> Ban <br>
                             <input type="radio" name="actions" value="unban"> Unban <br> <br>
@@ -87,7 +89,6 @@
                                     </form>
                                 </td>
                             </tr>
-
                         </table>
                     </div>
                 </form>
diff --git a/website/views/profile.php b/website/views/profile.php
index 9675a04..e8fae1e 100644
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -2,7 +2,7 @@
     <div class="profile-box platform">
         <img class="left profile-picture" src="http://i.imgur.com/afjEUx2.jpg">
         <div class="profile-button">
-            <p><img src="../website/img/add-friend.png"> Als vriend toevoegen</p>
+            <p><img src="../img/add-friend.png"> Als vriend toevoegen</p>
         </div>
         <h1 class="profile-username">[gebruikersnaam]</h1>
         <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec dictum turpis quam, eu ultrices sapien hendrerit tincidunt. Nunc aliquam neque turpis, id porta quam iaculis id. Sed suscipit, nisl a fermentum congue, nunc augue finibus lectus, id varius nunc purus nec dolor. Integer laoreet tellus sit amet sapien auctor congue. Mauris laoreet eu elit vel rhoncus. Nam et tortor arcu. Maecenas sit amet leo quis tellus varius gravida. Sed quis fermentum odio, sed dictum nulla. Donec aliquam rutrum orci cursus tempus. Quisque sit amet ipsum eget velit aliquam facilisis ultricies quis ligula. Nunc nisi lacus, luctus non bibendum quis, sagittis sit amet odio.</p>
diff --git a/website/views/settings-view.php b/website/views/settings-view.php
index 7caf36c..797217e 100644
--- a/website/views/settings-view.php
+++ b/website/views/settings-view.php
@@ -36,7 +36,6 @@
             <label for="bio">Bio</label>
             <textarea name="bio"
                       rows="5"
-                      cols="10"
                       title="bio"
                       id="bio"
             ></textarea>
@@ -48,22 +47,25 @@
             >
         </form>
 
-
         <form class="settings-password platform" method="post">
             <h5>Verander Wachtwoord</h5>
             <br />
+            <label>Oud Wachtwoord</label>
             <input type="password"
                    name="password-old"
                    placeholder="Oud wachtwoord"
             ><br />
+            <label>Nieuw wachtword</label>
             <input type="password"
                    name="password-new"
                    placeholder="Nieuw wachtwoord"
             ><br />
+            <label>Bevestig wachtwoord</label>
             <input type="password"
                    name="password-confirm"
                    placeholder="Bevestig wachtwoord"
             ><br />
+            <label></label>
             <input type="submit"
                    value="Verander wachtwoord"
             >
@@ -72,14 +74,19 @@
         <form class="settings-email platform" method="post">
             <h5>Verander Email</h5>
             <br />
+            <label for="email">Nieuw Email</label>
             <input type="email"
                    name="email"
-                   placeholder="Nieuw Email-adres"
+                   id="email"
+                   placeholder="Nieuw Email"
             ><br />
+            <label for="email-confirm">Bevestig Email</label>
             <input type="email"
                    name="email-confirm"
+                   id="email-confirm"
                    placeholder="Bevestig Email"
             ><br />
+            <label></label>
             <input type="submit"
                    value="Verander Email"
             >
