diff --git a/website/public/edit_friendship.php b/website/public/API/edit_friendship.php
similarity index 91%
rename from website/public/edit_friendship.php
rename to website/public/API/edit_friendship.php
index d88e264..0a08066 100644
--- a/website/public/edit_friendship.php
+++ b/website/public/API/edit_friendship.php
@@ -1,7 +1,8 @@
 <?php
 session_start();
-require("../queries/friendship.php");
-require("../queries/user.php");
+
+require("../../queries/friendship.php");
+require("../../queries/user.php");
 
 if(empty($_POST["userID"]) OR empty($_POST["delete"]) AND empty($_POST["accept"]) AND empty($_POST["request"])) {
     echo "Not enough arguments.";
diff --git a/website/public/js/notifications.js b/website/public/js/notifications.js
index e3476b2..aacff71 100644
--- a/website/public/js/notifications.js
+++ b/website/public/js/notifications.js
@@ -2,8 +2,8 @@ function showFriendNotifications(notifications) {
     $("#friendrequestslist").html("");
     for (i in notifications) {
         $("#friendrequestslist").append(" \
-            <li class='friend-item $extraItem'> \
-                <form action='profile.php' method='get'> \
+            <li class='friend-item'> \
+                <form action='profile.php' method='post'> \
                     <button type='submit' \
                             name='username' \
                             value='"+ notifications[i].username +"'> \
@@ -13,6 +13,22 @@ function showFriendNotifications(notifications) {
                         </div> \
                     </button> \
                 </form> \
+                <div class='notification-options'>\
+                    <form action='API/edit_friendship.php' method='post'> \
+                        <button type='submit' \
+                                name='accept' \
+                                class='accept-notification' \
+                                value='"+ notifications[i].userID +"'> \
+                            <i class='fa fa-check'></i> \
+                        </button>\
+                        <button\
+                                name='delete' \
+                                class='deny-notification' \
+                                value='"+ notifications[i].userID +"'> \
+                            <i class='fa fa-times'></i> \
+                        </button> \
+                    <form>\
+                </div> \
             </li> \
         ");
     }
@@ -22,10 +38,10 @@ function showChatNotifications(notifications) {
     $("#unreadChatlist").html("");
     for (i in notifications) {
         $("#unreadChatlist").append(" \
-            <li class='friend-item $extraItem'> \
+            <li class='friend-item'> \
                 <form action='chat.php' method='get'> \
                     <button type='submit' \
-                            name='username' \
+                            name='chatID' \
                             value='"+ notifications[i].userID +"'> \
                         <div class='friend'> \
                             <img alt='PF' class='profile-picture' src='"+ notifications[i].profilepicture +"'/> \
diff --git a/website/public/styles/menu.css b/website/public/styles/menu.css
index ce294da..204acd0 100644
--- a/website/public/styles/menu.css
+++ b/website/public/styles/menu.css
@@ -63,4 +63,32 @@
 
 #quick-links i:hover {
     color: #FBC02D;
+}
+
+.notification-options {
+    display: none;
+    width: 100%;
+}
+
+.notification-options form {
+    width: 100%;
+    text-align: center;
+}
+
+.notification-options button {
+    display: inline-block;
+    padding: 5px 20px;
+    width: auto;
+}
+
+.accept-notification:hover {
+    color: #4CAF50;
+}
+
+.deny-notification:hover {
+    color: firebrick;
+}
+
+.friend-item:hover .notification-options {
+    display: inline-block;
 }
\ No newline at end of file
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index 4fbb55d..d40ee88 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -80,6 +80,7 @@ function selectAllUnreadChat() {
     $stmt = $GLOBALS["db"]->prepare("
     SELECT
       LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `name`,
+      `user`.`userID`,
       IFNULL(
         `profilepicture`,
         '../img/notbad.jpg'
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
index 598b3ee..797e457 100644
--- a/website/views/chat-view.php
+++ b/website/views/chat-view.php
@@ -35,7 +35,12 @@
                                 </div>
                             </div>
                         </li>
-                ";
+                    ";
+                }
+
+                $chatID = $_GET["chatID"];
+                if (isset($chatID) && $chatID != "") {
+                    echo "<script>$(document).ready(function(){switchUser('$chatID')});</script>";
                 }
                 ?>
             </ul>
diff --git a/website/views/loadFriends.php b/website/views/loadFriends.php
new file mode 100644
index 0000000..b4cbaca
--- /dev/null
+++ b/website/views/loadFriends.php
@@ -0,0 +1,3 @@
+<?php
+
+echo json_encode(selectAllFriends($_SESSION["userID"])->fetchAll());
\ No newline at end of file