diff --git a/website/public/styles/index.css b/website/public/styles/index.css
index 196485e..c7a0aa8 100644
--- a/website/public/styles/index.css
+++ b/website/public/styles/index.css
@@ -133,6 +133,12 @@ label {
     color: red;
 }
 
+.login_containerNoscript {
+    padding: 4px;
+    text-align: center;
+    color: red;
+}
+
 @keyframes animatezoom {
     from {transform: scale(0)}
     to {transform: scale(1)}
@@ -150,7 +156,7 @@ label {
     margin: 16px auto;
     overflow-y: auto;
     padding: 20px;
-    width: 600px;
+    width: 650px;
 }
 
 select{
diff --git a/website/queries/checkInput.php b/website/queries/checkInput.php
index 663da1f..69274ce 100644
--- a/website/queries/checkInput.php
+++ b/website/queries/checkInput.php
@@ -47,6 +47,8 @@ function checkName($variable){
         throw new lettersAndSpacesException("Verplicht!");
     } else if (!preg_match("/^[a-zA-Z ]*$/", $variable)) {
         throw new lettersAndSpacesException("Alleen letters en spaties zijn toegestaan!");
+    } else if (strlen($variable) > 63){
+        throw new lettersAndSpacesException(("Mag maximaal 63 karakters hebben!"));
     }
 }
 
@@ -81,6 +83,8 @@ function username($variable){
         throw new usernameException("Moet minstens 6 karakters bevatten");
     } else if (getExistingUsername() == 1) {
         throw new usernameException("Gebruikersnaam bestaal al");
+    } else if (strlen($variable) > 50) {
+        throw new usernameException("Mag maximaal 50 karakters!");
     }
 }
 
@@ -92,6 +96,8 @@ function fbUsername($variable){
         throw new usernameException("Moet minstens 6 karakters bevatten");
     } else if (getExistingFBUsername() == 1) {
         throw new usernameException("Gebruikersnaam bestaal al");
+    } else if (strlen($variable) > 50) {
+        throw new usernameException("Mag maximaal 50 karakters!");
     }
 }
 
@@ -101,6 +107,8 @@ function longerEight($variable){
         throw new passwordException("Verplicht!");
     } else if (strlen($variable) < 8) {
         throw new passwordException("Moet minstens 8 karakters bevatten");
+    } else if (strlen($variable) > 50) {
+        throw new usernameException("Mag maximaal 50 karakters!");
     }
 }
 
@@ -112,9 +120,11 @@ function validateEmail($variable){
         throw new emailException("Geldige email invullen");
     } else if (getExistingEmail() == 1){
         throw new emailException("Email bestaal al!");
+    } else if (strlen($variable) > 255) {
+        throw new emailException("Mag maximaal 50 karakters!");
     }
 }
-
+//255
 /* checks if an input is a valid email. */
 function validateFBEmail($variable){
     if (empty($variable)) {
@@ -122,7 +132,9 @@ function validateFBEmail($variable){
     } else if (!filter_var($variable, FILTER_VALIDATE_EMAIL)) {
         throw new emailException("Geldige email invullen");
     } else if (getExistingFBEmail() == 1){
-        throw new emailException("Email bestaal al!");
+        throw new emailException("Uw email wordt al gebruikt voor een ander account!");
+    } else if (strlen($variable) > 255) {
+        throw new emailException("Mag maximaal 50 karakters!");
     }
 }
 
diff --git a/website/views/facebookRegisterModal.php b/website/views/facebookRegisterModal.php
index 7db44b0..7271d63 100644
--- a/website/views/facebookRegisterModal.php
+++ b/website/views/facebookRegisterModal.php
@@ -55,7 +55,6 @@
                     *<span class="error"> <?php echo $fbConfirmpasswordErr;?></span>
                 </div>
 
-
                 <?php if(empty($userBday)) { ?>
                 <!-- Register birthday -->
                 <div class="login_containerregister">
@@ -67,6 +66,7 @@
                 </div>
                 <?php } ?>
             </div>
+            *<span class="error"> <?php echo $fbEmailErr;?></span>
             <div class="modal-footer">
                 <button type="submit"
                         value="fbRegister"
@@ -77,7 +77,6 @@
             </div>
         </div>
 
-
         <input type="hidden"
                name="fbName"
                value="<?php echo $fbName ?>">
diff --git a/website/views/homeLoginRegister.php b/website/views/homeLoginRegister.php
index beffff8..54c2015 100644
--- a/website/views/homeLoginRegister.php
+++ b/website/views/homeLoginRegister.php
@@ -7,7 +7,6 @@ $fbUsername = $fbPassword = $fbConfirmpassword = "";
 $fbUsernameErr = $fbPasswordErr = $fbConfirmpasswordErr = $fbEmailErr = $fbBdayErr = "";
 $fbCorrect = true;
 $fbName = $fbSurname = $fbBday = $fbEmail = $fbUserID = "";
-$bdayExist = false;
 
 // Register variables
 $name = $surname = $bday = $username = $password = $confirmpassword = $location = $housenumber = $email = $confirmEmail = $captcha = $ip = "";
diff --git a/website/views/login-view.php b/website/views/login-view.php
index f525103..98ce71c 100644
--- a/website/views/login-view.php
+++ b/website/views/login-view.php
@@ -1,3 +1,9 @@
+<div class="login_containerNoscript">
+    <noscript>
+        <a href="http://www.enable-javascript.com/nl/" target="_blank">Om deze site te gebruiken is het noodzakelijk om Javascript aan te zetten.
+            Klikt hier voor de instructies om je Javascript te activeren</a>.
+    </noscript>
+</div>
 <div>
     <img style="width:50%;margin-left:25%"
          src="/img/top-logo.png"
@@ -62,11 +68,12 @@
 <!--Login with facebook button-->
 <?php
     if(!isset($acces_token)) {
-        echo '<div class="login_containerlogin"><a class="fbButton" href="' . $loginurl . '">login with Facebook!</a></div>';
+        echo '<div class="login_containerlogin"><a class="fbButton" href="' . $loginurl . '"><i class="fa fa-facebook-square"></i> login met     Facebook!</a></div>';
     }
 ?>
 
 <script>
+
 // Get the modal
 var modal = document.getElementById('myModal');
 var registerModal = document.getElementById('registerModal');
diff --git a/website/views/login_head.php b/website/views/login_head.php
index e319a9d..61bf9c3 100644
--- a/website/views/login_head.php
+++ b/website/views/login_head.php
@@ -7,7 +7,11 @@
     <link rel="stylesheet"
           type="text/css"
           href="styles/index.css">
+    <link rel="stylesheet"
+          type="text/css"
+          href="styles/font-awesome.css">
     <script src="js/jquery.js"></script>
     <script src="js/registerAndLogin.js"></script>
     <script src='https://www.google.com/recaptcha/api.js'></script>
+
 </head>