diff --git a/killer-chat.php b/killer-chat.php
new file mode 100644
index 0000000..c44158e
--- /dev/null
+++ b/killer-chat.php
@@ -0,0 +1,103 @@
+<head>
+<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
+<link rel="stylesheet" href="./css/basic.css" />
+<link rel="stylesheet" href="./css/main.css" />
+
+<?php	
+	require './credentials.php';
+	require './php/utils.php';
+	
+	$credentials = new Credentials();
+	$usersdb = $credentials->usersdb;
+	$mortsdb = $credentials->mortsdb;
+	
+	date_default_timezone_set("Europe/Berlin");
+	
+	$user = $_COOKIE['user']; // (int)$_POST['user'];
+	$password = $_COOKIE['password']; // isset($_POST['password']) ? md5($_POST['password']) : '';
+
+	if (!isset($_COOKIE['user']) or $_COOKIE['user'] == '') {
+		die("<script>window.location.href = './'</script>");
+	} else if (isset($_COOKIE['password'])) {
+		$query_password = "SELECT password FROM $usersdb WHERE id=$user";
+		if (query($query_password)->fetch_row()[0] != $password) {
+			// Unset variables
+			setcookie('user', '', -1, "/");
+			setcookie('password', '', -1, "/");
+			
+			die("<script>window.location.href = './?passwordchanged=1'</script>");
+		}
+	}
+?>
+
+
+<?php
+        $user = get_users($_COOKIE['user']);
+        $victim = get_users($user->quimata);
+        if ($user->mort) die("<script>window.location.href = './dead.php'</script>");
+?>
+
+		<meta charset="UTF-8">
+		<title>PastanagAPP</title>
+
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="manifest" href="https://api.myjson.com/bins/u6r41">
+
+		<!-- Apple web app -->
+		<link rel="apple-touch-icon" href="./bin/images/icons/icon-72x72.png">
+		<meta name="apple-mobile-web-app-title" content="PastanagAPP">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="green">
+
+</head>
+<body>
+        <div id="outter-container">
+                <div id="inner-container">
+                        <div><a href="./main.php">Tornar a la pàgina principal</a></div>
+                
+                        <div id="message-board">
+                        <div id="killer-messages">
+                                <div class="messages-sent">
+                                        <?php
+                                                // Create connection
+                                                $credentials = new Credentials();
+                                                $conn = new mysqli($credentials->servername, $credentials->username, $credentials->password, $credentials->dbname);
+                                                if ($conn->connect_error) die("Connection failed: " . $conn->connect_error);
+                                                $conn->set_charset("utf8");
+                                               
+                                                $query_quielmata = "SELECT id FROM pastanaga WHERE quimata = " . $user->id;
+                                                $quielmata = $conn->query($query_quielmata)->fetch_row()[0];
+                                                
+                                                // Execute query and save result
+                                                $query_msgs = "SELECT * FROM `missatges` WHERE (`sender_id` = ".$user->id." AND `receiver_id` = ".$quielmata .
+                                                        ") OR (`sender_id` = ".$quielmata." AND `receiver_id` = ".$user->id . ")";
+                                                $result = $conn->query($query_msgs);
+                                                
+                                                while($res = $result->fetch_row()) {
+                                                        if ($res[1] == $user->id) {
+                                                                echo "<div class='from-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Enviat' : 'Vist')."</span></div></div>";
+                                                        } else {
+                                                                echo "<div class='to-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Nou!' : '')."</span></div></div>";
+                                                        }
+                                                }
+                          
+                                                // Update 'seen' messages
+                                                $query_seen = "UPDATE missatges SET `seen` = 1 WHERE `receiver_id` = " . $user->id . " AND `sender_id` != " . $user->quimata;
+                                                $conn->query($query_seen);
+                                                
+                                                // Close the connection 
+                                                $conn->close();
+                                        ?>
+                                </div>
+                                <form action="./php/send_thread.php" method="POST">
+                                        <input type="text" name="msg-content" placeholder="Demostra que no tens por" />
+                                        <input type="hidden" name="killer-id" value="<?=(int)$user->id?>">
+                                        <input type="hidden" name="victim-id" value="<?=(int)$quielmata?>">
+                                        <input type="hidden" name="origin" value="killer">
+                                        <input type="submit" value="Respon amenaça" />
+                                </form>
+                        </div>
+                        </div>
+                </div>
+        </div>
+</body>
\ No newline at end of file
diff --git a/main.php b/main.php
index 3c6cbe6..d9d0ae8 100644
--- a/main.php
+++ b/main.php
@@ -124,78 +124,16 @@
 					</table>
 				</div>
 				
-				<div id="message-board">
-                                <div id="victim-messages">
-                                        <div class="messages-sent">
-                                                <?php
-                                                        // Create connection
-                                                        $credentials = new Credentials();
-                                                        $conn = new mysqli($credentials->servername, $credentials->username, $credentials->password, $credentials->dbname);
-                                                        if ($conn->connect_error) die("Connection failed: " . $conn->connect_error);
-                                                        $conn->set_charset("utf8");
-                                                                                                                
-                                                        // Execute query and save result
-                                                        $query_msgs = "SELECT * FROM `missatges` WHERE (`sender_id` = ".$user->id." AND `receiver_id` = ".$user->quimata .
-                                                                ") OR (`sender_id` = ".$user->quimata." AND `receiver_id` = ".$user->id . ")";
-                                                        $result = $conn->query($query_msgs);
-                                                        
-                                                        while($res = $result->fetch_row()) {
-                                                                if ($res[1] == $user->id) {
-                                                                        echo "<div class='from-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Enviat' : 'Vist')."</span></div></div>";
-                                                                } else {
-                                                                        echo "<div class='to-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Nou!' : '')."</span></div></div>";
-                                                                }
-                                                        }
-                                                ?>
-                                        </div>
-					<form action="./php/send_thread.php" method="POST">
-						<input type="text" name="msg-content" placeholder="Que es cagui de por" />
-						<input type="hidden" name="killer-id" value="<?=(int)$user->id?>">
-						<input type="hidden" name="victim-id" value="<?=(int)$user->quimata?>">
-						<input type="submit" value="Enviar amenaça" />
-					</form>
-                                 </div>
-                                 <hr />
-                                 <h5>El teu assassí:</h5>
-                                 <div id="killer-messages">
-                                        <div class="messages-sent">
-                                                <?php
-                                                        $query_quielmata = "SELECT id FROM pastanaga WHERE quimata = " . $user->id;
-                                                        $quielmata = $conn->query($query_quielmata)->fetch_row()[0];
-                                                        
-                                                        // Execute query and save result
-                                                        $query_msgs = "SELECT * FROM `missatges` WHERE (`sender_id` = ".$user->id." AND `receiver_id` = ".$quielmata .
-                                                                ") OR (`sender_id` = ".$quielmata." AND `receiver_id` = ".$user->id . ")";
-                                                        $result = $conn->query($query_msgs);
-                                                        
-                                                        while($res = $result->fetch_row()) {
-                                                                if ($res[1] == $user->id) {
-                                                                        echo "<div class='from-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Enviat' : 'Vist')."</span></div></div>";
-                                                                } else {
-                                                                        echo "<div class='to-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Nou!' : '')."</span></div></div>";
-                                                                }
-                                                        }
-                                  
-                                                        // Update 'seen' messages
-                                                        $query_seen = "UPDATE missatges SET `seen` = 1 WHERE `receiver_id` = " . $user->id;
-                                                        $conn->query($query_seen);
-                                                        
-                                                        // Close the connection 
-                                                        $conn->close();
-                                                ?>
-                                        </div>
-					<form action="./php/send_thread.php" method="POST">
-						<input type="text" name="msg-content" placeholder="Demostra que no tens por" />
-						<input type="hidden" name="killer-id" value="<?=(int)$user->id?>">
-						<input type="hidden" name="victim-id" value="<?=(int)$quielmata?>">
-						<input type="submit" value="Respon amenaça" />
-					</form>
-				</div>
-                                </div>
-				
+                                <?php
+                                        $query_seen_victim = "SELECT COUNT(*) FROM missatges WHERE `seen` = 0 AND (`receiver_id` = " . $user->id . " AND `sender_id` = " . $user->quimata . ")";
+                                        $query_seen_killer = "SELECT COUNT(*) FROM missatges WHERE `seen` = 0 AND (`receiver_id` = " . $user->id . " AND `sender_id` != " . $user->quimata . ")";
+                                ?>
+                                
 				<div>
 					<p>Podeu posar aquesta pàgina com a icona apretant el botó de "Add to Home Screen" del vostre navegador.</p>
-					<a href="./ranking.php">Anar al rànquing</a>
+					<a href="./ranking.php">Anar al rànquing</a><br />
+                                        <a href="./victim-chat.php">Xatejar amb la teva víctima (<?= query($query_seen_victim)->fetch_row()[0] ?>)</a><br />
+                                        <a href="./killer-chat.php">Xatejar amb el teu assassí (<?= query($query_seen_killer)->fetch_row()[0] ?>)</a>
 				</div>
 			</div>
 		</div>
diff --git a/victim-chat.php b/victim-chat.php
new file mode 100644
index 0000000..4987489
--- /dev/null
+++ b/victim-chat.php
@@ -0,0 +1,102 @@
+<head>
+<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
+<link rel="stylesheet" href="./css/basic.css" />
+<link rel="stylesheet" href="./css/main.css" />
+                
+<?php	
+	require './credentials.php';
+	require './php/utils.php';
+	
+	$credentials = new Credentials();
+	$usersdb = $credentials->usersdb;
+	$mortsdb = $credentials->mortsdb;
+	
+	date_default_timezone_set("Europe/Berlin");
+	
+	$user = $_COOKIE['user']; // (int)$_POST['user'];
+	$password = $_COOKIE['password']; // isset($_POST['password']) ? md5($_POST['password']) : '';
+
+	if (!isset($_COOKIE['user']) or $_COOKIE['user'] == '') {
+		die("<script>window.location.href = './'</script>");
+	} else if (isset($_COOKIE['password'])) {
+		$query_password = "SELECT password FROM $usersdb WHERE id=$user";
+		if (query($query_password)->fetch_row()[0] != $password) {
+			// Unset variables
+			setcookie('user', '', -1, "/");
+			setcookie('password', '', -1, "/");
+			
+			die("<script>window.location.href = './?passwordchanged=1'</script>");
+		}
+	}
+?>
+
+
+<?php
+        $user = get_users($user);
+        $victim = get_users($user->quimata);
+        if ($user->mort) die("<script>window.location.href = './dead.php'</script>");
+?>
+
+
+		<meta charset="UTF-8">
+		<title>PastanagAPP</title>
+
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="manifest" href="https://api.myjson.com/bins/u6r41">
+
+		<!-- Apple web app -->
+		<link rel="apple-touch-icon" href="./bin/images/icons/icon-72x72.png">
+		<meta name="apple-mobile-web-app-title" content="PastanagAPP">
+		<meta name="apple-mobile-web-app-capable" content="yes">
+		<meta name="apple-mobile-web-app-status-bar-style" content="green">
+</head>
+<body>
+        <div id="outter-container">
+                <div id="inner-container">
+                        <div><a href="./main.php">Tornar a la pàgina principal</a></div>
+                        
+                        <div id="message-board">
+                        <div id="victim-messages">
+                                <div class="messages-sent">
+                                        <?php
+                                                // Create connection
+                                                $credentials = new Credentials();
+                                                $conn = new mysqli($credentials->servername, $credentials->username, $credentials->password, $credentials->dbname);
+                                                if ($conn->connect_error) die("Connection failed: " . $conn->connect_error);
+                                                $conn->set_charset("utf8");
+                                                                                                        
+                                                // Execute query and save result
+                                                $query_msgs = "SELECT * FROM `missatges` WHERE (`sender_id` = ".$user->id." AND `receiver_id` = ".$user->quimata .
+                                                        ") OR (`sender_id` = ".$user->quimata." AND `receiver_id` = ".$user->id . ")";
+                                                $result = $conn->query($query_msgs);
+                                                
+                                                while($res = $result->fetch_row()) {
+                                                        if ($res[1] == $user->id) {
+                                                                echo "<div class='from-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Enviat' : 'Vist')."</span></div></div>";
+                                                        } else {
+                                                                echo "<div class='to-me'><div class='msg-content'>$res[4]</div><div class='meta-data'><span class='timestamp'>$res[3]</span><span class='seen'>".($res[5] == 0 ? 'Nou!' : '')."</span></div></div>";
+                                                        }
+                                                }
+                                                
+                                                // Update 'seen' messages
+                                                $query_seen = "UPDATE missatges SET `seen` = 1 WHERE `receiver_id` = " . $user->id . " AND `sender_id` = " . $user->quimata;
+                                                $conn->query($query_seen);
+                                                
+                                                // Close the connection 
+                                                $conn->close();
+                                        ?>
+                                </div>
+                                <form action="./php/send_thread.php" method="POST">
+                                        <input type="text" name="msg-content" placeholder="Que es cagui de por" />
+                                        <input type="hidden" name="killer-id" value="<?=(int)$user->id?>">
+                                        <input type="hidden" name="victim-id" value="<?=(int)$user->quimata?>">
+                                        <input type="hidden" name="origin" value="victim">
+                                        <input type="submit" value="Enviar amenaça" />
+                                </form>
+                         </div>
+                        
+                        </div>
+
+                </div>
+        </div>
+</body>
\ No newline at end of file