diff --git a/.gitignore b/.gitignore
index acadb23..b1a2ad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,10 @@
 
 
 # User-specific stuff:
-/.idea/*
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/deployment.xml
+.idea/webServers.xml
 
 # Sensitive or high-churn files:
 .idea/dataSources/
diff --git a/website/index.php b/website/index.php
index b594d58..b808caf 100644
--- a/website/index.php
+++ b/website/index.php
@@ -1,21 +1,145 @@
 <!DOCTYPE html>
 <html>
-    <?php
-        include("views/head.php");
-     ?>
-    <body>
-        <?php
-            /*
-             * This view adds the main layout over the screen.
-             * Header and menu.
-             */
-            include("views/main.php");
+  <head>
+    <link rel="stylesheet" type="text/css" href="styles/index.css">
+    <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>
 
-            /* Add your view files here. */
-            include("views/homepage.php");
+    <form action="../profile.php/" method="post">
+      <h1>Welkom </h1>
+      <div class="containercenter">
+        <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>
 
-            /* This adds the footer. */
-            include("views/footer.php");
-         ?>
-    </body>
+      <div class="containercenter">
+        <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="containercenter">
+        <input type="submit" value="Login" name="Submit" id="frm1_submit" />
+      </div>
+    </form>
+
+    <div class="containercenter">
+      <button onclick="document.getElementById('id01').style.display='block'">Registreer</button>
+    </div>
+
+    <div class="container">
+      <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="container">
+            <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="container">
+            <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="container">
+            <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="container">
+            <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="container">
+            <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="container">
+            <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="container">
+            <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="container">
+            <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="container">
+            <label><b>Herhaal email</b></label>
+            <input type="email" placeholder="Herhaal email" id="confirmemail"
+            title="Herhaal je email" required>
+          </div>
+
+          <div class="container">
+            <input type="submit" value="Registreer je account" name="Submit" id="frm1_submit" />
+          </div>
+        </form>
+
+      </div>
+    </div>
+  </body>
 </html>
+
+<script>
+// Get the modal
+var modal = document.getElementById('id01');
+// When the user clicks anywhere outside of the modal, close it
+window.onclick = function(event) {
+   if (event.target == modal) {
+       modal.style.display = "none";
+   }
+}
+</script>
+
+<script>
+function passwordfunction() {
+    var password1 = document.getElementById("password").value;
+    var password2 = document.getElementById("confirmpassword").value;
+    var email1 = document.getElementById("email").value;
+    var email2 = document.getElementById("confirmemail").value;
+    var matching = true;
+
+    if (password1 != password2) {
+        document.getElementById("password").style.borderColor = "red";;
+        document.getElementById("confirmpassword").style.borderColor = "red";;
+        ok = false;
+        confirmpassword.setCustomValidity("Wachwoord match niet")
+    }
+    if (email != email2){
+        document.getElementById("email").style.borderColor = "red";;
+        document.getElementById("confirmemail").style.borderColor = "red";;
+        ok = false;
+        confirmemail.setCustomValidity("Email match niet")
+    }
+    return matching;
+}
+</script>
diff --git a/website/search.php b/website/search.php
new file mode 100644
index 0000000..6a045c3
--- /dev/null
+++ b/website/search.php
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+    <?php
+        include("views/head.php");
+    ?>
+    <body>
+        <?php
+            /*
+             * This view adds the main layout over the screen.
+             * Header and menu.
+             */
+            include("views/main.php");
+
+            /* Add your view files here. */
+            include("views/search-view.php");
+
+            /* This adds the footer. */
+            include("views/footer.php");
+        ?>
+    </body>
+</html>
diff --git a/website/styles/index.css b/website/styles/index.css
new file mode 100644
index 0000000..6823115
--- /dev/null
+++ b/website/styles/index.css
@@ -0,0 +1,135 @@
+/* Body */
+body {
+    background-color: #B78996;
+}
+
+/* Bordered form */
+form {
+    background-color: #a87a87;
+    border: 5px solid #325da3;
+    border-radius: 12px;
+    height: 50%;
+    margin: auto;
+    width: 45%;
+}
+
+h1 {
+    padding: 16px;
+    text-align: center;
+}
+
+h2 {
+    padding: 16px;
+    text-align: left;
+}
+
+label {
+    display: block;
+}
+
+/* Full-width inputs */
+input[type=text], input[type=password], input[type=email] {
+    border-radius: 12px;
+    border: 5px solid #ccc;
+    box-sizing: border-box;
+    display: inline-block;
+    height: 50%;
+    padding: 12px 20px;
+    margin: 8px 0;
+    width: 50%;
+}
+
+input[type=submit]{
+    background-color: #845663;
+    border: 2px solid black;
+    border-radius: 12px;
+    color: white;
+    cursor: pointer;
+    height: 50%;
+    margin: 8px 0;
+    padding: 14px 20px;
+    width: 50%;
+}
+
+/* Set a style for all buttons */
+button {
+    background-color: #845663;
+    border: 2px solid black;
+    border-radius: 12px;
+    color: white;
+    cursor: pointer;
+    height: 50%;
+    margin: 8px 0;
+    padding: 14px 20px;
+    width: 25%;
+}
+
+/* Add padding to containers */
+.container {
+    padding: 16px;
+    text-align: left;
+}
+
+.containercenter {
+    padding: 16px;
+    text-align: center;
+}
+
+/* The Modal (background) */
+.modal {
+    background-color: rgb(0,0,0); /* Fallback color */
+    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+    display: none; /* Hidden by default */
+    height: 100%;
+    left: 0;
+    margin: auto;
+    overflow: auto; /* Enable scroll if needed */
+    padding-top: 60px;
+    position: fixed; /* Stay in place */
+    top: 0;
+    width: 100%; /* Full width */
+    z-index: 1; /* Sit on top */
+}
+
+/* Modal Content/Box */
+.modal-content {
+    background-color: #B78996;
+    border: 5px solid #325da3;
+    margin: 5px auto; /* 15% from the top and centered */
+    overflow-y: auto;
+    width: 50% /* Could be more or less, depending on screen size */
+}
+
+/* The Close Button */
+.close {
+    /* Position it in the top right corner outside of the modal */
+    color: white;
+    font-size: 100px;
+    font-weight: bold;
+    position: absolute;
+    right: 25px;
+    top: 0;
+}
+
+/* Close button on hover */
+.close:hover,
+.close:focus {
+    color: red;
+    cursor: pointer;
+}
+
+/* Add Zoom Animation */
+.animate {
+    animation: animatezoom 0.6s
+    -webkit-animation: animatezoom 0.6s;
+}
+
+@-webkit-keyframes animatezoom {
+    from {-webkit-transform: scale(0)}
+    to {-webkit-transform: scale(1)}
+}
+
+@keyframes animatezoom {
+    from {transform: scale(0)}
+    to {transform: scale(1)}
+}
diff --git a/website/styles/main.css b/website/styles/main.css
index fb50ae3..52df4f0 100644
--- a/website/styles/main.css
+++ b/website/styles/main.css
@@ -41,6 +41,13 @@ body {
     min-height: 100%;
 }
 
+.platform {
+    padding: 20px;
+    border-radius: 10px;
+    background-color: #FFFFFF;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
+}
+
 ::selection {
     background: #845663;
     color: white;
@@ -120,7 +127,7 @@ td {
 }
 
 /* Custom title box, appears instantaneously */
-a:hover, img:hover, span:hover, div:hover {
+a[data-title]:hover, img[data-title]:hover, span[data-title]:hover, div[data-title]:hover {
     position: relative;
 }
 
diff --git a/website/template.php b/website/template.php
new file mode 100644
index 0000000..b594d58
--- /dev/null
+++ b/website/template.php
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+    <?php
+        include("views/head.php");
+     ?>
+    <body>
+        <?php
+            /*
+             * This view adds the main layout over the screen.
+             * Header and menu.
+             */
+            include("views/main.php");
+
+            /* Add your view files here. */
+            include("views/homepage.php");
+
+            /* This adds the footer. */
+            include("views/footer.php");
+         ?>
+    </body>
+</html>
diff --git a/website/views/header.php b/website/views/header.php
index 45cb2b9..86686a5 100644
--- a/website/views/header.php
+++ b/website/views/header.php
@@ -3,15 +3,15 @@
         <a href="profile.php"><img src="img/top-logo.png" alt="MyHyvesbook+" /></a>
     </div>
     <div id="header-search">
-        <form action="php/search.php" method="get">
-            <input type="text" placeholder="search people, friends and pages" />
+        <form action="search.php" method="get">
+            <input name="search" type="text" placeholder="search people, friends and pages" />
             <input type="submit" value="Zoek"/>
         </form>
     </div>
     <div class="right profile-menu">
         <div id="profile-menu-popup">
-            <a href="#"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
-            <a href="#"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
+            <a href="login.php"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
+            <a href="setting.php"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
             <a href="profile.php"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
         </div>
         <div id="profile-hello-popup">
diff --git a/website/views/search-view.php b/website/views/search-view.php
new file mode 100644
index 0000000..4116e31
--- /dev/null
+++ b/website/views/search-view.php
@@ -0,0 +1,5 @@
+<div class="content">
+    <div class="platform">
+        Hey
+    </div>
+</div>
\ No newline at end of file
