diff --git a/dev_mvc/controller/ActionHandler.php b/dev_mvc/controller/ActionHandler.php
index d6e830a..56f9eb7 100644
--- a/dev_mvc/controller/ActionHandler.php
+++ b/dev_mvc/controller/ActionHandler.php
@@ -3,10 +3,13 @@ class ActionHandler
 {
     static function doAction(){
         $action = '';
+        
         if(isset($_GET['action'])){
-            if(!$action == ''){
-                include_once("./model/actions/model_".$action."php");
-            }
+            $action = $_GET['action'];   
+        }
+        if(!$action == ''){
+            include_once("./model/actions/model_".$action.".php");
+            
         }
     }
 }
diff --git a/dev_mvc/controller/UserSession.php b/dev_mvc/controller/UserSession.php
index 7b76eeb..b35bfab 100644
--- a/dev_mvc/controller/UserSession.php
+++ b/dev_mvc/controller/UserSession.php
@@ -39,7 +39,7 @@ Class UserSession{
     public static function isSessionValid(){
         if(isset($_SESSION['usersession'])){
             if(!Database::isSessionValid($_SESSION['usersession']->token, $_SESSION['usersession']->uid)){
-                include_once("./model/model_attempt_logout.php");
+                echo('session invalid in db');
                 return false;
             }
             if(!UserSession::isSessionExpired($_SESSION['usersession'])){
@@ -86,11 +86,20 @@ Class UserSession{
                 if(Database::isSessionValid(UserSession::getSession()->token, UserSession::getSession()->uid)){
                     return true;
                 }
+                
             }
             else{
                 return false;
             }
         }
+        else{
+            return false;
+        }
+    }
+    public static function updateSigninState(){
+        if(!UserSession::isUserSignedIn()){
+            
+        }
     }
 }
 ?>
\ No newline at end of file
diff --git a/dev_mvc/controller/Database.php b/dev_mvc/controller/db/Database.php
similarity index 99%
rename from dev_mvc/controller/Database.php
rename to dev_mvc/controller/db/Database.php
index 26e9bdb..38e5d64 100644
--- a/dev_mvc/controller/Database.php
+++ b/dev_mvc/controller/db/Database.php
@@ -121,7 +121,7 @@ Class Database{
         }
         else{
             //something went wrong, return -1
-            return "dbfetcherror";
+            return "db_user_invalid";
         }
     }
 
@@ -235,6 +235,7 @@ Class Database{
         $query->execute();
         //Check hoeveelheid teruggestuurde rijen
         if($query->rowCount() == 1){
+            echo('session valid in db<br>');
             return true;
         }
         else{
@@ -242,6 +243,7 @@ Class Database{
         }
     }
     static function invalidateSession($token){
+        echo("hek");
         //Init db connection
         $con = Database::connectToDB();
         //Bereid query voor
diff --git a/dev_mvc/index.php b/dev_mvc/index.php
index 393a72b..fb03563 100644
--- a/dev_mvc/index.php
+++ b/dev_mvc/index.php
@@ -15,10 +15,11 @@ include_once("./controller/Database.php");
 include_once("./controller/UserSession.php");
 include_once("./controller/HUtils.php");
 include_once("./controller/ActionHandler.php");
-
+//Start session.
 session_start();
+//Execute Actie zo nodig.
 ActionHandler::doAction();
-
+UserSession::UpdateSigninState();
 
 
 //Store de geselecteerde pagina in variabele $page
diff --git a/dev_mvc/model/actions/model_signout.php b/dev_mvc/model/actions/model_signout.php
new file mode 100644
index 0000000..40f138b
--- /dev/null
+++ b/dev_mvc/model/actions/model_signout.php
@@ -0,0 +1,7 @@
+<?php
+include_once("./controller/UserSession.php");
+if(UserSession::isSessionValid()){
+    Database::invalidateSession(UserSession::getSession()->token);
+}
+session_destroy();
+?>
\ No newline at end of file
diff --git a/dev_mvc/model/model_do_register.php b/dev_mvc/model/model_do_register.php
index 8d6cbca..053392d 100644
--- a/dev_mvc/model/model_do_register.php
+++ b/dev_mvc/model/model_do_register.php
@@ -18,7 +18,7 @@ if(HUtils::issetPost(['email', 'pass', 'pass2', 'name'])){
             Database::registerUser($email, $pass, $name);
             $uid = Database::getUID($email, $pass);
             Database::registerActivationKey($uid,$verificationKey);
-            $message = 'Please follow the link to verify your account: http://localhost/webforum_redux/index.php?p=verify&key='.$verificationKey;
+            $message = 'Please follow the link to verify your account: http://localhost/webforum_redux/hforumphp/dev_mvc/index.php?p=verify&key='.$verificationKey;
             $headers = 'From: webmaster@example.com' . "\r\n" .
             'Reply-To: webmaster@example.com' . "\r\n" .
             'X-Mailer: PHP/' . phpversion();
diff --git a/dev_mvc/view/pagecontent/content_create_topic.php b/dev_mvc/view/pagecontent/content_create_topic.php
index dc10d56..71b2f4b 100644
--- a/dev_mvc/view/pagecontent/content_create_topic.php
+++ b/dev_mvc/view/pagecontent/content_create_topic.php
@@ -1,4 +1,4 @@
 <?php
-
+    
 
 ?>
\ No newline at end of file
diff --git a/dev_mvc/view/pagecontent/content_header.php b/dev_mvc/view/pagecontent/content_header.php
index 184e0d0..033f637 100644
--- a/dev_mvc/view/pagecontent/content_header.php
+++ b/dev_mvc/view/pagecontent/content_header.php
@@ -4,4 +4,8 @@ if(UserSession::isUserSignedIn()){
 }else{
     include("./view/pagecontent/header/content_header_signedout.php"); 
 }
+if(!UserSession::isSessionValid()){
+    include_once("./model/actions/model_signout.php");
+}
+echo('content_header');
 ?>
\ No newline at end of file
diff --git a/dev_mvc/view/pagecontent/header/content_header_signedin.php b/dev_mvc/view/pagecontent/header/content_header_signedin.php
index c1b3e1d..39a112c 100644
--- a/dev_mvc/view/pagecontent/header/content_header_signedin.php
+++ b/dev_mvc/view/pagecontent/header/content_header_signedin.php
@@ -3,5 +3,5 @@ include_once("./controller/AssetHandler.php");
 AssetHandler::printAsset("logo.png", true, 128);
 ?>
 <nav>
-    <a href="?p=attempt_logout">log out</a> <a href="?p=">home</a> <a href="?p=create_topic">create thread</a> <a href="?p=destroy">simulate $_SESSION expiry</a>
+    <a href="?a=signout">log out</a> <a href="?p=">home</a> <a href="?p=create_topic">create thread</a> <a href="?p=destroy">simulate $_SESSION expiry</a>
 </nav>
\ No newline at end of file