diff --git a/JS/registerCheck.js b/JS/registerCheck.js
index e3bcbeb..1fb1def 100644
--- a/JS/registerCheck.js
+++ b/JS/registerCheck.js
@@ -1,91 +1,186 @@
-var registerButton = GetByID('registerButton');
-        registerButton.onclick = function(){
-            var errors = [];
-            var name = document.getElementsByName('Name')[0];
-            var surname = document.getElementsByName('Surname')[0];
-            var telephone = document.getElementsByName('telephone')[0];
-            var email = document.getElementsByName('email')[0];
-            var pass1 = document.getElementsByName('password1')[0];
-            var pass2 = document.getElementsByName('password2')[0];
-            name.style.border = '0px solid black';
-            surname.style.border = '0px solid black';
-            telephone.style.border = '0px solid black';
-            email.style.border = '0px solid black';
-            pass1.style.border = '0px solid black';
-            pass2.style.border = '0px solid black';
-            var checker = 0;
-            
-            if (name.value !== ""){
-                if (name.value[0] !== name.value[0].toUpperCase()){
-                    errors.push('Your name must start with a capital letter.');
-                    name.style.border = '2px solid red';
+
+    var registerButton = GetByID('registerButton');
+
+    registerButton.onclick = function(){
+        var errors = [];
+        var name = document.getElementsByName('Name')[0];
+        var surname = document.getElementsByName('Surname')[0];
+        var telephone = document.getElementsByName('telephone')[0];
+        var email = document.getElementsByName('email')[0];
+        var pass1 = document.getElementsByName('password1')[0];
+        var pass2 = document.getElementsByName('password2')[0];
+        name.style.border = '0px solid black';
+        surname.style.border = '0px solid black';
+        telephone.style.border = '0px solid black';
+        email.style.border = '0px solid black';
+        pass1.style.border = '0px solid black';
+        pass2.style.border = '0px solid black';
+        var checker = 0;
+
+        if (name.value !== ""){
+            if (name.value[0] !== name.value[0].toUpperCase()){
+                errors.push('Your name must start with a capital letter.');
+                name.style.border = '2px solid red';
+            }
+            else {
+                checker++;
+            }
+        }
+        else {
+            name.style.border = '2px solid red';
+        }
+        if (surname.value !== ""){
+            if (surname.value[0] !== surname.value[0].toUpperCase()){
+                errors.push('Your surname must start with a capital letter.');
+                surname.style.border = '2px solid red';
+            }
+            else {
+                checker++;
+            }
+        }
+        else {
+            surname.style.border = '2px solid red';
+        }
+        if (telephone.value !== ""){
+            if (isNaN(telephone.value)){
+                telephone.style.border = '2px solid red';
+            }
+            else {
+                checker++;
+            }
+        }
+        else {
+             telephone.style.border = '2px solid red';
+        }
+        if (email.value !== ""){
+            var checkedEmail = 0;
+            for (var x in email.value){
+                if (email.value[x] == '@'){
+                    checkedEmail++;
                 }
-                else {
-                    checker++;
+                else if (email.value[x] == '.'){
+                    checkedEmail++;
                 }
             }
+            if (checkedEmail >= 2){
+                checker++;
+            }
             else {
-                name.style.border = '2px solid red';
+                 email.style.border = '2px solid red';
+            }
+        }
+        else {
+             email.style.border = '2px solid red';
+        }
+        if (pass1.value !== "" && pass2.value !== ""){
+            if (pass1.value !== pass2.value){
+                errors.push('Passwords are not equal.');
+                pass1.style.border = '2px solid red';
+                pass2.style.border = '2px solid red';
+            }
+            else {
+                checker++;
             }
-            if (surname.value !== ""){
-                if (surname.value[0] !== surname.value[0].toUpperCase()){
-                    errors.push('Your surname must start with a capital letter.');
-                    surname.style.border = '2px solid red';
+        }
+        else {
+            pass1.style.border = '2px solid red';
+            pass2.style.border = '2px solid red';
+        }
+        var getparameters = location.search.substr(1).split("&");
+        
+        for (var index = 0; index < getparameters.length; index++) {
+            var tmp = getparameters[index].split("=");
+            if (tmp[1] == 'company') var isCompany = true;
+        } 
+        if  (isCompany){
+            var companyname = document.getElementsByName('companyName')[0];
+            var companyID = document.getElementsByName('companyID')[0];
+            var companytelephone = document.getElementsByName('companyTelephone')[0];
+            var companyemail = document.getElementsByName('companyEmail')[0];
+            var companySector = document.getElementsByName('sector')[0];
+            
+            companyname.style.border = '0px solid black';
+            companyID.style.border = '0px solid black';
+            companytelephone.style.border = '0px solid black';
+            companyemail.style.border = '0px solid black';
+            companySector.style.border = '0px solid black';
+            
+            if (companyname.value !== ""){
+                if (companyname.value[0] !== companyname.value[0].toUpperCase()){
+                    errors.push('Your Company name must start with a capital letter.');
+                    companyname.style.border = '2px solid red';
                 }
                 else {
                     checker++;
                 }
             }
-            else {
-                surname.style.border = '2px solid red';
+            else{
+                companyname.style.border = '2px solid red';
             }
-            if (telephone.value !== ""){
-                if (isNaN(telephone.value)){
-                    telephone.style.border = '2px solid red';
+            
+            
+            if (companyID.value !== ""){
+                //check for social security number
+                checker++;
+            }
+            else{
+                companyID.style.border = '2px solid red';
+            }
+            
+            
+            if (companytelephone.value !== ""){
+                if (isNaN(companytelephone.value)){
+                    companytelephone.style.border = '2px solid red';
                 }
                 else {
                     checker++;
                 }
             }
             else {
-                 telephone.style.border = '2px solid red';
+                companytelephone.style.border = '2px solid red';
             }
-            if (email.value !== ""){
+            
+            if (companyemail.value !== ""){
                 var checkedEmail = 0;
-                for (var x in email.value){
-                    if (email.value[x] == '@'){
+                for (var x in companyemail.value){
+                    if (companyemail.value[x] == '@'){
                         checkedEmail++;
                     }
-                    else if (email.value[x] == '.'){
+                    else if (companyemail.value[x] == '.'){
                         checkedEmail++;
                     }
                 }
-                if (checkedEmail == 2){
+                if (checkedEmail >= 2){
                     checker++;
                 }
                 else {
-                     email.style.border = '2px solid red';
+                     companyemail.style.border = '2px solid red';
                 }
             }
             else {
-                 email.style.border = '2px solid red';
+                 companyemail.style.border = '2px solid red';
             }
-            if (pass1.value !== "" && pass2.value !== ""){
-                if (pass1.value !== pass2.value){
-                    errors.push('Passwords are not equal.');
-                    pass1.style.border = '2px solid red';
-                    pass2.style.border = '2px solid red';
-                }
-                else {
-                    checker++;
-                }
+            
+            if (companySector.value !== ''){
+                checker++;
             }
-            else {
-                pass1.style.border = '2px solid red';
-                pass2.style.border = '2px solid red';
+            else{
+                companySector.style.border = '2px solid red';
             }
-            
-            if (checker == 5){
-                GetByID('register').submit();
+        }
+        
+        if (isCompany){
+           var totalcheck = 10;
+        }
+        else {
+            var totalcheck = 5;
+        }
+        
+        
+        if (checker == totalcheck){
+            var forms = document.getElementsByTagName('form');
+            for (var x in forms){
+                forms[x].submit();
             }
-        }
\ No newline at end of file
+        }
+}
diff --git a/PHP/index.php b/PHP/index.php
index aa2fc68..59fd219 100644
--- a/PHP/index.php
+++ b/PHP/index.php
@@ -10,48 +10,74 @@
     </head>
     <body>
         <?php 
+            require_once('mysqli_connect.php');
             function check_login($dbc, $email = '', $pass = '') {
-    $errors = array(); // Initialize error array.
-    // Validate the email address:
-    if (empty($email)) {
-        $errors[] = 'Please, enter your email address';
-    } else {
-        $e = mysqli_real_escape_string($dbc, trim($email));
-    }
-    // Validate the password:
-    if (empty($pass)) {
-        $errors[] = 'Please, enter your password.';
-    } else {
-        $p = mysqli_real_escape_string($dbc, trim($pass));
-    }
-    //Validate if in the DB the BusinessID field is Null or not:
-    if (is_null($BussID)){
-        // enter as Individual 
-    } else {
-        // enter as Business
-    }
-    if (empty($errors)) { // If everything's OK.
-        // Retrieve the Name and Surname for that email/password combination:
-        $q = "SELECT Name, Surname, BusinessID FROM Individuals WHERE Email='$e' AND EncryptedPassword=SHA1('$p') AND BusinessID='$BussID'";      
-        $r = @mysqli_query ($dbc, $q); // Run the query.
-        
-        // Check the result:
-        if (mysqli_num_rows($r) == 1) {
-            // Fetch the record:
-            $row = mysqli_fetch_array ($r, MYSQLI_ASSOC);
+                $errors = array(); // Initialize error array.
+                // Validate the email address:
+                if (empty($email)) {
+                    $errors[] = 'Please, enter your email address';
+                } else {
+                    $e = mysqli_real_escape_string($dbc, trim($email));
+                }
+                // Validate the password:
+                if (empty($pass)) {
+                    $errors[] = 'Please, enter your password.';
+                } else {
+                    $p = mysqli_real_escape_string($dbc, trim($pass));
+                }
     
-            // Return true and the record:
-            return array(true, $row);
-            
-        } else { // Not a match!
-            $errors[] = 'The email address and password entered do not match those on file.';
-        }
+                if (empty($errors)) { // If everything's OK.
+                    // Retrieve the Name and Surname for that email/password combination:
+                   
+                    $q = "SELECT Name, Surname, BusinessID FROM Individuals WHERE Email='$e' AND EncryptedPassword=SHA1('$p')";      
+                    $r = @mysqli_query ($dbc, $q); // Run the query.
+                    
+                    // Check the result:
+                    if (mysqli_num_rows($r) == 1) {
+                        // Fetch the record:
+                        $row = mysqli_fetch_array ($r, MYSQLI_ASSOC);
+                      
+                        // Return true and the record:
+                        return array(true, $row);
+
+                    } else { // Not a match!
+                        $errors[] = 'The email address and password entered do not match those on file.';
+                    }
+
+                } // End of empty($errors) IF.
+
+                // Return false and the errors:
+                return array(false, $errors);
+            } // End of check_login() function.
+        ?>
+        <?php
+            if ($_SERVER['REQUEST_METHOD'] == 'POST'){
+                $login_result = check_login($dbc, $_POST['user_email'], $_POST['user_pass']);
+                
+                if ($login_result[0]){
+                   
+                    echo "Thanks " . $login_result[1]['Name'] . " " . $login_result[1]['Surname'] . "!";
+                    echo '<br>';
+                    //Validate if in the DB the BusinessID field is Null or not:
+                    if (is_null($login_result[1]['BusinessID'])){
+                        session_start();
+                        $_SESSION["individual"]=$login_result[1]['Name'] . " " . $login_result[1]['Surname'];
+                        header("Location: main.php");
+                    } 
+                    else {
+                        session_start();
+                        $_SESSION["company"]=$login_result[1]['Name'] . " " . $login_result[1]['Surname'] . " " . $login_result[1]['BusinessID'];
+                        // lock $row
+                        header("Location: main.php");
+                    }
+                    
+                    
+                    
+                }
+            }
+        
+        
         
-    } // End of empty($errors) IF.
-    
-    // Return false and the errors:
-    return array(false, $errors);
-} // End of check_login() function.
         ?>
         <div id="entry_container">
             <div id="about" class="box">
@@ -67,11 +93,11 @@ function check_login($dbc, $email = '', $pass = '') {
             </div>
             <div id="login" class="box">
                <span class="title">OnTime</span>
-                <form>
+                <form method="post">
                     <div>
-                        <input class="input text" type="text" placeholder="Email">
+                        <input name="user_email" class="input text" type="text" placeholder="Email" value="<?php if (isset($_POST['user_email'])){echo $_POST['user_email'];}?>">
                     <br>
-                        <input class="input text" type="password" placeholder="Password">
+                        <input name="user_pass" class="input text" type="password" placeholder="Password">
                     </div>
                     <br>                  
                     <div id="submits">
@@ -81,7 +107,7 @@ function check_login($dbc, $email = '', $pass = '') {
                 </form>
             </div>
         </div>
-        <?php include('footer.html'); ?>
+        <?php include('footer.php'); ?>
         <div id="flag" class="modal">
             <div class="modal-content">
                 <div id="individual" class="box">I'm an individual</div>
diff --git a/PHP/main.php b/PHP/main.php
new file mode 100644
index 0000000..d94543c
--- /dev/null
+++ b/PHP/main.php
@@ -0,0 +1,21 @@
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+</head>
+<body>
+<?php
+session_start();
+if (isset($_SESSION["individual"])){
+    echo "You are: " . $_SESSION["individual"] . " " . "You are a individual";   
+    echo '<body style="background-color:red">';
+}
+else{
+    echo "You are: " . $_SESSION["company"] . " " . "You are a company";
+    echo '<body style="background-color:blue">';
+   
+}
+
+
+?>
+    
+</body>
\ No newline at end of file
diff --git a/PHP/register.php b/PHP/register.php
index b7e5b85..1d57f26 100644
--- a/PHP/register.php
+++ b/PHP/register.php
@@ -10,119 +10,144 @@
 </head>
 <body>
    <?php 
+
+    require_once('mysqli_connect.php');
 // Check for form submission:
-if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-    require ('mysqli_connect.php'); // Connect to the db.
-    $errors = array();       
-    //We use arrays to store the particular's and the company's information.
-    $particular = array();
-    $company = array();
-    // Check for a name
-    if (empty($_POST['Name'])) {
-        $errors[] = 'Enter the name.';
-    } 
-    else {
-        $particular_name = mysqli_real_escape_string($dbc, trim($_POST['Name']));
-    }
-    // Check for a surname
-    if (empty($_POST['Surname'])) {
-        $errors[] = 'Enter the surname.';
-    } 
-    else {
-        $particular_surname = mysqli_real_escape_string($dbc, trim($_POST['Surname']));
-    }
-    // Check for an email address
-    if (empty($_POST['email'])) {
-        $errors[] = 'Enter the email address.';
-    } 
-    else {
-        $part = mysqli_real_escape_string($dbc, trim($_POST['email']));
-    }
-    //Check the telephone.
-    if (empty($_POST['telephone'])) {
-        $errors[] = 'Enter the telephone number.';
-    } 
-    else {
-        $telephoneP = mysqli_real_escape_string($dbc, trim($_POST['telephone']));
-    }
-    //Check for a password
-    if (!empty($_POST['password1'])) {
-    	//check if password1 = password2
-        if ($_POST['password1'] != $_POST['password2']) {
-            $errors[] = 'Passwords did not match';
-        } 
-        else {
-            $passwordP = mysqli_real_escape_string($dbc, trim($_POST['password1']));
-        }
-    } 
-    else {
-        $errors[] = 'Enter the password.';
-    }
-    //Company mode 
-	if ($_GET['mode']=='company'){
-	   //Check for a company name
-        if (empty($_POST['companyName'])) {
-            $errors[] = 'Enter the company name.';
-        } 
-        else {
-            $companyP = mysqli_real_escape_string($dbc, trim($_POST['companyName']));
-        }
-	   //Check for a company email	
-        if (empty($_POST['companyEmail'])) {
-            $errors[] = 'Enter the company email.';
-        }
-        else {
-            $emailCP = mysqli_real_escape_string($dbc, trim($_POST['companyEmail']));
-        }
-	   //Check for a company telephone	
-        if (empty($_POST['companyTelephone'])) {
-            $errors[] = 'Enter the telephone number of the company.';
-        } 
-        else {
-            $telephoneCP = mysqli_real_escape_string($dbc, trim($_POST['companyTelephone']));
-        } 
-    }
-    if (empty($errors)) { // If everything's OK.
-    //Company mode
-    	if ($_GET['mode']=='company'){
-            $insert = "INSERT INTO individuals (Name, Surname, email, telephone, EncryptedPassword) VALUES ('$nameP', '$surnameP', '$emailP', '@telephoneP', '$passwordP'"; 
-            $insert = "INSERT INTO business (BusinessName, Email, telephone, Sector) VALUES ('$companyP', '$emailCP', '$telephoneCP', '$passwordP'"; 
-            $done = @mysqli_query ($dbc, $q); // Run the query.
-            if ($done) { // If it ran OK.
-                // Print a message:
-                echo '<h1>Thank you!</h1>';
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+             // Connect to the db.
+            $errors = array();       
+            //We use arrays to store the particular's and the company's information.
+            $particular = array();
+            $company = array();
+             // Check for a name
+            if (empty($_POST['Name'])) {
+                $errors[] = 'Enter the name.';
+            } 
+            else {
+                $particular['Name'] = mysqli_real_escape_string($dbc, trim($_POST['Name']));
+            }
+            // Check for a surname
+            if (empty($_POST['Surname'])) {
+                $errors[] = 'Enter the surname.';
+            } 
+            else {
+                $particular['Surname'] = mysqli_real_escape_string($dbc, trim($_POST['Surname']));
+            }
+            // Check for an email address
+            if (empty($_POST['email'])) {
+                $errors[] = 'Enter the email address.';
             } 
             else {
-                // Register the user in the database...
-        	   //insert the data in mysql
-                $insert = "INSERT INTO individuals (Email, Name, Surname, Telephone, EncryptedPassword) VALUES ('$emailP', '$nameP', '$surnameP', '$telephoneP', '$passwordP')"; 
-                $done = @mysqli_query ($dbc, $insert); // Run the query.
-                if ($done) { // If it ran OK.
-                    // Print a message:
-                    echo '<h1>Thank you!</h1>';  
+                $particular['email'] = mysqli_real_escape_string($dbc, trim($_POST['email']));
+            }
+            //Check the telephone.
+            if (empty($_POST['telephone'])) {
+                $errors[] = 'Enter the telephone number.';
+            } 
+            else {
+                $particular['telephone'] = mysqli_real_escape_string($dbc, trim($_POST['telephone']));
+            }
+            //Check for a password
+            if (!empty($_POST['password1'])) {
+                //check if password1 = password2
+                if ($_POST['password1'] != $_POST['password2']) {
+                    $errors[] = 'Passwords did not match';
+                } 
+                else {
+                    $particular['password'] = mysqli_real_escape_string($dbc, trim($_POST['password1']));
+                }
+            } 
+            else {
+                $errors[] = 'Enter the password.';
+            }
+            //Company mode 
+            if (isset($_POST['companyID'])){
+               //Check for a company name
+                if (empty($_POST['companyID'])) {
+                    $errors[] = 'Enter the company id.';
+                } 
+                else {
+                    $company['ID'] = mysqli_real_escape_string($dbc, trim($_POST['companyID']));
                 }
-                else { // If it did not run OK.
-                    // Public message:
-                    echo '<h1>System Error</h1>
-                    <p class="error">You could not be registered due to a system error. We apologize for any inconvenience.</p>'; 
+                if (empty($_POST['companyName'])) {
+                    $errors[] = 'Enter the company name.';
+                } 
+                else {
+                    $company['Name'] = mysqli_real_escape_string($dbc, trim($_POST['companyName']));
+                }
+                
+               //Check for a company email	
+                if (empty($_POST['companyEmail'])) {
+                    $errors[] = 'Enter the company email.';
+                }
+                else {
+                    $company['Email'] = mysqli_real_escape_string($dbc, trim($_POST['companyEmail']));
+                }
+                if (empty($_POST['sector'])){
+                    $errors[] = 'Enter sector';
+                }
+                else{
+                    $company['sector'] = mysqli_real_escape_string($dbc, trim($_POST['sector']));
+                }
+               //Check for a company telephone	
+                if (empty($_POST['companyTelephone'])) {
+                    $errors[] = 'Enter the telephone number of the company.';
+                } 
+                else {
+                    $company['Telephone'] = mysqli_real_escape_string($dbc, trim($_POST['companyTelephone']));
+                } 
+            }
+            
             
-                    // Debugging message:
-                    echo '<p>' . mysqli_error($dbc) . '<br /><br />Query: ' . $insert . '</p>';
-                        
+            
+            
+            if (empty($errors)) { // If everything's OK.
+                if (isset($_POST['companyID'])){
+                    $insertCompany = "
+                    INSERT INTO business (BusinessID, BusinessName, Email, Sector, Telephone) 
+                    VALUES (";
+                    foreach ($company as $key=>$value){
+                        $insertCompany = $insertCompany . "'" . $value . "'" . ",";
+                    } 
+                    $insertCompany = substr($insertCompany, 0, strlen($insertCompany) - 1);
+                    $insertCompany = $insertCompany . ")";
+                
+               
+                    $result = @mysqli_query($dbc, $insertCompany);
+                }
+                
+                $insertParticular = "
+                INSERT INTO individuals (Name, Surname, email, telephone, EncryptedPassword, BusinessID) 
+                VALUES (";
+                foreach ($particular as $key=>$value){
+                    $insertParticular = $insertParticular . "'" . $value . "'" . ",";
                 } 
-                mysqli_close($dbc); // Close the database connection.
-                // Include the footer and quit the script:
+               
+                if (isset($_POST['companyID'])){
+                    $insertParticular = $insertParticular . "'" . $company['ID'] . "'";
+                }
+                else {
+                    $insertParticular = $insertParticular . "NULL";
+                    
+                }
+                
+                $insertParticular =  $insertParticular . ")";
+               
+                $result_par = @mysqli_query($dbc, $insertParticular);
+                var_dump($result_par);
+                if ($result_par){
+                    echo '<h1>Thank you!</h1>';
+                }
+                
+                mysqli_close($dbc); 
+                   
             }
-            mysqli_close($dbc); 
-            // Close the database connection.
         }
-    }
-}
-?>
+    ?>
     <div class="registerForm">
         <div class="box">
            <span class="title">Individual's Data</span>
-            <form id="register" action="register.php?mode=<?php echo $_GET['mode'] ?>" method="post">
+            <form id="register" action="register.php" method="post">
                 <input class="input text" type="text" name="Name" placeholder="Name" value=<?php if (isset($_POST['Name'])){echo $_POST['Name'];} ?>>
                 <input class="input text" type="text" name="Surname" placeholder="Surname" value=<?php if (isset($_POST['Surname'])){echo $_POST['Surname'];} ?>>
                 <input class="input text" type="email" name="email" placeholder="Email" value=<?php if (isset($_POST['email'])){echo $_POST['email'];} ?>>
@@ -131,8 +156,8 @@
                 <input class="input text" type="password" name="password2" placeholder="Confirm Password" value=<?php if (isset($_POST['password2'])){echo $_POST['password2'];} ?>>
                 <br>            
     <?php
-        if ($_GET['mode']=='company'){
-            require('mysqli_connect.php');
+        if ($_SERVER['REQUEST_METHOD'] == 'GET'){
+        if ($_GET['mode'] == 'company'){
                 echo "
                 </div>
                 <div class='box'>
@@ -143,7 +168,7 @@
                         <input class='input text' type='email' name='companyEmail' placeholder='Company Email'>
                         <input class='input text' type='text' name='companyTelephone' placeholder='Company Telephone'>
                         <p>Sectors 
-                        <select class='input option'>";
+                        <select name='sector' class='input option'>";
                 $q = "SELECT Name FROM Sectors";     
                 $r = @mysqli_query ($dbc, $q); // Run the query.
                 while ($row = mysqli_fetch_array($r, MYSQLI_ASSOC))
@@ -151,13 +176,20 @@
                     echo "<option>" . $row['Name'] . "</option>";
                 }           
                 echo "</select></p>";
-            }    
+
+            }
+        }
         echo "
         <input id='registerButton' class='button' type='button' value='Register'>   
         </div>
         "
     ?>
-    <script src="registerCheck.js"></script>
-    <?php include('footer.html')?>
+    <script src="../JS/registerCheck.js"></script>
+    <?php include('footer.php')?>
+                
+                
+                
+                
+         
 </body>
 </html>
diff --git a/flag.js b/flag.js
new file mode 100644
index 0000000..60abfcf
--- /dev/null
+++ b/flag.js
@@ -0,0 +1,41 @@
+function CreateFlag(){
+    var companySelect = CreateElement('div', 'flag', 'modal');
+    var selectContent = CreateElement('div', '', 'modal-content');
+    var search_div = CreateElement('div');
+    var search_bar = CreateElement('input', 'search_company', 'input');
+    var search_img = CreateElement('img', '', 'search_icon');
+	var result_div = CreateElement('div', 'result_company');
+    var css = '.search_icon:hover{cursor: pointer}';
+    var style = document.createElement('style');
+
+    companySelect.style.display = 'flex';
+    selectContent.style.display = 'flex';
+    selectContent.style.textAlign = "center";  
+    selectContent.style.flexDirection = 'column';
+    selectContent.style.backgroundColor = 'red';
+    search_div.style.display = 'flex';
+    search_img.setAttribute('src', '../IMG/search_icon_white.png');
+    search_img.style.marginTop = '0.5vh';
+
+    search_img.onclick = function(){
+        if (search_bar.value !== ""){
+            AJAX_select('POST', 'select_companies.php', 'pattern', search_bar.value, show_companies);
+        }
+    }
+
+    if (style.styleSheet) {
+        style.styleSheet.cssText = css;
+    } 
+    else {
+        style.appendChild(document.createTextNode(css));
+    }
+    GetElement('head').appendChild(style);
+    search_div.appendChild(search_bar);
+    search_div.appendChild(search_img);
+    selectContent.appendChild(search_div);
+	selectContent.appendChild(result_div);
+    companySelect.appendChild(selectContent);
+    GetElement('body').appendChild(companySelect); 
+}
+
+
diff --git a/main.php b/main.php
new file mode 100644
index 0000000..085e856
--- /dev/null
+++ b/main.php
@@ -0,0 +1,88 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="stylesheet" href="../fullcalendar-3.8.0/fullcalendar.min.css">
+    <link href="../fullcalendar-3.8.0/fullcalendar.print.min.css" rel="stylesheet" media="print">
+    <script src="../fullcalendar-3.8.0/lib/moment.min.js"></script>
+    <script src="../fullcalendar-3.8.0/lib/jquery.min.js"></script>
+    <script src="../fullcalendar-3.8.0/fullcalendar.js"></script>
+    <script src="../fullcalendar-3.8.0/locale-all.js"></script>
+    <script src="../JS/flag.js"></script>
+    <?php 
+        session_start();
+        include('header.php');
+    ?>
+    <script>
+        $(document).ready(function(){
+            $('#calendar').fullCalendar({
+                timeFormat: 'H(:mm)',
+                header: {
+                    center: 'month,agendaWeek,agendaDay'
+                },
+                allDaySlot: false,
+                selectable: false,
+                dayClick: function(){
+                   var vista = $('#calendar').fullCalendar('getView').name;
+                   if (vista == 'month'){
+                       $('#calendar').fullCalendar('changeView', 'agendaDay');
+                       $('#calendar').fullCalendar('option', {selectable:true, aspectRatio:2});
+                   }
+                   else {
+                       //EVENTO
+                   }
+
+                },
+                select: function(start, end){  
+                   var active = GetByClass('fc-state-active', 0);
+                   var flag = document.getElementById('flag');
+                   if (active){
+                        active.setAttribute('class', active.getAttribute('class').substr(0, active.getAttribute('class').length - 15));
+                   }
+                   if (flag){
+                       if (flag.style.display == 'none'){
+                            flag.style.display = 'flex';
+                   		}
+                   }
+                   else{
+					   CreateFlag();
+                   }       
+                },
+                aspectRatio: 2  
+           }) 
+        });
+    </script>
+</head>
+<body>
+   <div class="main_container">
+    <div id="sidebar" class="box">
+        <img style="width:10vw" src="../IMG/ontime_logo.png">
+        <h3>
+            <?php
+                echo $_SESSION['IndividualName'] . " " . $_SESSION['IndividualSurname'];
+            ?>
+            
+        </h3>
+        <div style="display:flex;flex-direction:column">
+            <a class="menu_tabs" href="agenda.php">My appointments</a>
+            <a class="menu_tabs" href="">Make an appointment</a>
+            <a class="menu_tabs" href="">Settings</a>
+        </div>
+    </div>
+
+   <div id="calendar" style="width:60vw;margin-right:auto;margin-top:5vh">
+    
+   </div>
+   
+    </div>
+<script>
+	window.onclick = function(event) {
+        var flag = GetByID('flag');
+        if(flag){
+            if (event.target == flag) {
+            	flag.style.display = "none";
+            }
+        }                
+    }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ontime.css b/ontime.css
new file mode 100644
index 0000000..e8412d6
--- /dev/null
+++ b/ontime.css
@@ -0,0 +1,363 @@
+a{
+    text-decoration: none;
+}
+body{
+    background-color: #fefefe;
+    margin: 0;
+    font-family: 'Rubik', sans-serif;    
+}
+/* ID'S */
+#about {
+    background-color: #6060B9;
+    color: white;
+    font-size: 2.5vh;
+    text-align: center;
+    width: 50vw;
+}
+#about a {
+    color: white;
+    font-size: 3.5vh;
+}
+#about a:hover {
+    color: blue;
+}
+#about .title {
+    color: white;
+    text-shadow: 0px 0px 1px white;
+}
+#company {
+    background-color: #6060D9;
+}
+#entry_container {
+    display: flex;
+    height: 60vh;
+    justify-content: space-around;
+    margin-top: 1vh;
+    width: 99vw;
+}
+#footer {
+    display: flex;
+    background-color: #e5e5e5;
+    bottom: 0;
+    height: 12vh;
+    position:absolute;
+    width: 100vw;
+}
+#footer * {
+    margin-top: 5vh;
+    margin-left: 5vw;
+    margin-right: 5vw;
+}
+#footer .mention {
+    margin-left: auto;
+}
+#footer a {
+    margin-left: auto;
+    margin-top: 3.75vh;
+    color: #6906f9;
+    font-size: 5vh;
+}
+#header {
+    align-items: center;
+    background-color: #6060B9;
+    box-shadow: 0px 1px 10px black;
+    display: flex;
+    
+    width: 100vw;
+}
+#individual {
+    background-color: #D96060;
+}
+#login {
+    align-items: center;
+    background-color: white;
+    border-radius: 0.25em;
+    display: flex;
+    font-family: 'Rubik', sans-serif;
+    justify-content: center;
+}
+#logo {
+    background-color: white;
+    border-radius: 100em;
+    height: 12vh;
+    margin-left: 5vh;
+    width: 12vh;
+}
+#logout {
+    margin-right: 5vw;
+    margin-left: auto;
+    padding: 3vh;
+    box-shadow: 0px 0px 3px white;
+    color: white;
+}
+#logout:hover {
+    background-color: white;
+    color: #6060b9;
+}
+#motto {
+    color: white;
+    font-family: 'Rubik', sans-serif;
+    font-size: 6vh;
+    font-style: italic;
+    margin-left: 18vw;
+    
+}
+#registerButton:hover {
+    background-color: #60B960;
+    color: white;
+}
+#result_company{
+	background-color: yellow;
+	height: 80%;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+	overflow-y: scroll;
+	width: 100%;
+}
+#sidebar {
+    width: 20vw;
+    height: 70vh;
+    
+    margin-right: auto;
+}
+#sidebar a {
+    margin-bottom: 8vh;
+}
+#search_bar {
+    width: 50vw;
+    margin: auto;
+}
+#search_company {
+    width: 30vw;
+    
+}
+
+
+/* CLASSES */
+.main_container {
+    display: flex;
+    
+}
+.main_container .box {
+    margin-right: auto;
+}
+.box {
+    align-items: center;
+    background-color: white;
+    border-radius: 0.25em;
+    box-shadow: 0px 0px 8px black;
+    display: flex;
+    flex-direction: column;
+    height: 60vh;
+    justify-content: center;
+    margin-top: 5vh;
+    width: 32vw;
+}
+
+.company_box {
+	width: 33.3%;
+	height: 15%;
+	box-shadow: 0px 0px 8px black;
+	background-color: blue;
+}
+
+.button {
+    margin-top: -2vh;
+    background-color: white;
+    border-radius: 4px;
+    color: #6060B9;
+    font-family: 'Rubik', sans-serif;
+    font-size: 3.25vh;
+    height: 5vh;
+    width: 10vw;
+}
+.button:hover {
+    background-color: #6060B9;
+    color: white;
+}
+.input {
+    border-radius: 0.25em;
+    color: #555555;
+    font-size: 3vh;
+    height: 5vh;
+    margin-bottom: 0.5vh;
+}
+.text {
+    width: 20vw;
+}
+.text:focus {
+    outline-color: black;
+}
+.option {
+    width: 15vw;
+}
+.isbusiness {
+    display: none; /* Hidden by default */
+    position: fixed; /* Stay in place */
+    z-index: 1; /* Sit on top */
+    padding-top: 100px; /* Location of the box */
+    left: 0;
+    top: 0;
+    width: 100vw; /* Full width */
+    height: 30vh; /* Full height */
+    overflow: auto; /* Enable scroll if needed */
+    background-color: rgb(0,0,0); /* Fallback color */
+    background-color: rgba(0,255,0,0.4); /* Black w/ opacity */
+
+}
+.title {
+    color: #6060B9;
+    font-size: 1.75em;
+    letter-spacing: 0.25vw;
+    margin-bottom: 4vh;
+    text-shadow: 0px 0px 1px black;
+}
+.modal {
+    display: none; /* Hidden by default */
+    position: fixed; /* Stay in place */
+    z-index: 1; /* Sit on top */
+    padding-top: 100px; /* Location of the box */
+    left: 0;
+    top: 0;
+    width: 100%; /* Full width */
+    height: 100%; /* Full height */
+    overflow: auto; /* Enable scroll if needed */
+     background-color: #000000AA;
+    justify-content: center;
+}
+.modal-content {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    padding: 20px;
+    width: 80%;
+    height: 60vh;
+}
+.modal-content .box{
+    width: 38vw;
+    height: 30vh;
+    font-size: 1.5em;
+    color: white;
+    text-align: center;
+    cursor: pointer;
+}
+.menu_tabs {
+    color: #FFFFFF;
+    text-align: center;
+    background-color: #6060B9;
+    padding: 2vh; 
+    box-shadow: 0px 0px 5px black;
+}
+.menu_tabs:hover {
+    background-color: #106060;
+}
+.registerForm {
+    display: flex;
+    height: 76vh;
+    width: 100vw;
+    justify-content: center;
+}
+.registerForm .box {
+    width: 30vw;
+    background-color: #6060D9CC;
+}
+.registerForm .box .title {
+    color: white;
+    text-shadow: 0px 0px 1px white;
+}
+.registerForm .box form {
+    display:  flex;
+    flex-direction: column;
+}
+
+.registerForm .box #registerButton {
+    margin-left: 10.5vw;
+}
+.search_icon {
+    margin-left:2vw;
+    height: 5vh;
+}
+/* Mobile Design */
+@media only screen and (max-device-width: 800px){
+    /* ID's */
+    #about {
+        display: none;
+    }
+    #entry_container {
+        flex-direction: column-reverse;
+        justify-content: center;
+    }
+    #footer {
+        display: none;
+    }
+    
+    #login form {
+        flex-direction: column;
+        font-size: 2.5em;
+        display: flex;
+    }
+    #logo {
+        height: 12.5em;
+        width: 12.5em;
+    }
+    #motto {
+        font-size: 3em;
+        margin-left: 1em;
+    }
+    #registerButton {
+        background-color: #60B960;
+    }
+    #submits {
+        display: flex;
+        flex-direction: row-reverse;
+        justify-content: space-between;
+    }
+    /* CLASSES */
+    .box {
+        box-shadow: 0px 0px 0px white;
+        height: 80vh;
+        justify-content: center;
+        margin-top: 0;
+        width: 100vw;
+    }
+    .button {
+        background-color: #6060B9;
+        color: white;
+        font-size: 1em;
+        height: 8vh;
+        width: 32vw;
+    }
+    .inputText {
+        margin-bottom: 2vh;
+        text-align: center;   
+        width: 70vw;
+        height: 8vh;
+    }
+    .title {
+        font-size: 5.5em;
+        margin-bottom: 1.5vh;
+    }
+    .registerForm {
+        height: 100vh;
+        flex-direction: column;
+    }
+    .registerForm  .inputText{
+        height: 4vh;
+    }
+    .registerForm .box {
+        width: 100vw;
+        font-size: 0.5vh;
+    }
+    .registerForm #registerButton {
+        font-size: 3vh;
+        
+    }
+}
+@media only screen and (max-height: 1000px){
+    #header {
+        height: 20vh;
+    }
+}
diff --git a/utilities.js b/utilities.js
new file mode 100644
index 0000000..38b897d
--- /dev/null
+++ b/utilities.js
@@ -0,0 +1,124 @@
+function GetByID(id){
+    return document.getElementById(id);
+}
+
+function GetByClass(className, number){
+    if (number !== undefined){
+        return document.getElementsByClassName(className)[number];
+    }
+    else {
+        return document.getElementsByClassName(className);
+    }
+}
+
+function GetIndexInClass(className, element){
+    var targetClass = GetByClass(className);
+    for (var i = 0; i < targetClass.length; i++){
+        if (targetClass[i] === element){
+            return i;
+        }
+    }
+}
+
+function GetElement(element){
+    return document[element];
+}
+
+function CreateElement(type, idName = "", className = ""){
+    var element = document.createElement(type);
+    element.setAttribute('id', idName);
+    element.setAttribute('class', className); 
+    return element;
+}
+
+function EraseElement(element){
+    element.parentNode.removeChild(element);
+}
+
+function EraseChildren(parent){
+    while(parent.firstChild){
+        EraseElement(parent.firstChild);
+    }
+}
+
+
+
+function AJAX_select(type, url, parameterName, parameterValue, callback){
+    var data = parameterName + "=" + parameterValue;
+    var xml_http = new XMLHttpRequest();
+    xml_http.onreadystatechange = function(){
+        if (this.readyState == 4 && this.status == 200){
+            callback(this.response);
+        }
+    };
+    xml_http.open(type, url, true);
+    xml_http.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");  
+    xml_http.send(data);
+}
+
+
+function show_companies(parameter){
+	var result_div = GetByID('result_company');
+	if (result_div){
+		EraseChildren(result_div);
+		var result = [];
+		var first = parameter.split(",");
+		for (var x in first){
+			var second = first[x].split("_");
+			result.push(second);
+		}
+		console.log(result);
+		for (var z=0; z < 20; z++){
+			
+				var company = CreateElement('div', '', 'company_box');
+				company.innerHTML = 'patata';
+				company.style.color = 'black';
+				company.onclick = function(){
+				}
+	
+
+				result_div.appendChild(company);
+			}
+		}
+	}
+	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+