diff --git a/website/public/profile.php b/website/public/profile.php
index 4854080..e35935b 100644
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -46,12 +46,12 @@ if(empty($_GET["username"])) {
     return;
 }
 
-$userID = getUserID($db, $_GET["username"]);
+$userID = getUserID($_GET["username"]);
 
-$user = selectUser($db, $userID);
-$friends = selectAllFriends($db, $userID);
-$groups = selectAllUserGroups($db, $userID);
-$posts = selectAllUserPosts($db, $userID);
+$user = selectUser($userID);
+$profile_friends = selectAllFriends($userID);
+$profile_groups = selectAllUserGroups($userID);
+$posts = selectAllUserPosts($userID);
 
 ?>
 
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index a3a2fb8..f13fed5 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -1,7 +1,7 @@
 <?php
 require("connect.php");
 
-function selectAllFriends($db, $userID) {
+function selectAllFriends($userID) {
     $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `username`,
diff --git a/website/queries/user.php b/website/queries/user.php
index de76ff7..c6e691a 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -1,8 +1,8 @@
 <?php
 require("connect.php");
 
-function getUserID($db, $username) {
-    $stmt = $db->prepare("
+function getUserID($username) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `userID`
         FROM
@@ -16,8 +16,8 @@ function getUserID($db, $username) {
     return $stmt->fetch()["userID"];
 }
 
-function selectUser($db, $userID) {
-    $stmt = $db->prepare("
+function selectUser($userID) {
+    $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `username`,
             IFNULL(
@@ -41,7 +41,7 @@ function selectUser($db, $userID) {
     return $stmt->fetch();
 }
 
-function selectAllUserGroups($db, $userID) {
+function selectAllUserGroups($userID) {
     $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `group_page`.`groupID`,
@@ -64,7 +64,7 @@ function selectAllUserGroups($db, $userID) {
     return $stmt;
 }
 
-function selectAllUserPosts($db, $userID) {
+function selectAllUserPosts($userID) {
     $stmt = $GLOBALS["db"]->prepare("
         SELECT
             `postID`,
diff --git a/website/views/menu.php b/website/views/menu.php
index 731b284..83ebfc0 100644
--- a/website/views/menu.php
+++ b/website/views/menu.php
@@ -13,7 +13,7 @@
                 $_SESSION["userID"] = 2;
 
             // Get all the friends of a user.
-            $friends = selectAllFriends($db, $_SESSION["userID"]);
+            $friends = selectAllFriends($_SESSION["userID"]);
             $i = 0;
 
             // Print all the users.
diff --git a/website/views/profile.php b/website/views/profile.php
index 395dd15..6c273a6 100644
--- a/website/views/profile.php
+++ b/website/views/profile.php
@@ -4,18 +4,19 @@
         <div class="profile-button">
             <p><img src="img/add-friend.png"> Als vriend toevoegen</p>
         </div>
-        <h1 class="profile-username"><?php echo $user["username"] ?></h1>
-        <p><?php echo $user["bio"] ?></p>
+        <h1 class="profile-username"><?= $user["fname"]?> <?=$user["lname"]?> (<?=$user["username"]?>)</h1>
+        <p><?=$user["bio"]?></p>
     </div>
 
     <div class="item-box left platform">
         <h2>Vrienden</h2>
         <p>
             <?php
-                while($friend = $friends->fetch()) {
-                    echo "<a href='#' data-title='" . $friend["username"] . "'><img class='profile-picture' src='" . $friend["profilepicture"] . "' alt='" . $friend["username"] . "'s profielfoto></a>";
+                while($friend = $profile_friends->fetch()) {
+                    echo "<a href='#' data-title='${friend["username"]}'><img class='profile-picture' src='${friend["profilepicture"]}' alt='${friend["username"]}'s profielfoto></a>";
                 }
 
+
                 if($friends->rowCount() === 0) {
                     echo "<p>Deze gebruiker heeft nog geen vrienden gemaakt.</p>";
                 }
@@ -27,7 +28,7 @@
         <h2>Groepen</h2>
         <p>
             <?php
-                while($group = $groups->fetch()) {
+                while($group = $profile_groups->fetch()) {
                     echo "<a href='#' data-title='${group["name"]}'><img class='group-picture' src='${group["picture"]}' alt='${group["name"]}s logo'></a>";
                 }
 
@@ -51,4 +52,5 @@
                 ";
             }
         ?>
+    </div>
 </div>
\ No newline at end of file