diff --git a/website/public/API/editMembership.php b/website/public/API/editMembership.php
new file mode 100644
index 0000000..dc5ef57
--- /dev/null
+++ b/website/public/API/editMembership.php
@@ -0,0 +1,40 @@
+<?php
+
+session_start();
+
+if(empty($_POST["grp"]) or empty($_POST["role"])) {
+    header('HTTP/1.1 500 Non enough arguments');
+}
+
+if(in_array($_POST["role"], array('request', 'member', 'banned', 'mod', 'admin'))) {
+    header('HTTP/1.1 500 Wrong argument given for role');
+}
+
+require_once ("../../queries/group_member.php");
+require_once ("../../queries/group_page.php");
+require_once ("../../queries/group_member.php");
+
+$currentRole = selectGroupRole($_POST["grp"]);
+$groupStatus = selectGroupStatus($_POST["grp"]);
+echo "role: $currentRole status: $groupStatus ";
+
+if($_POST["role"] == 'request' and $currentRole == 'none') {
+    if($groupStatus = 'public') {
+        // Add member to public group
+        addMember($_POST["grp"], $_SESSION["userID"], 'member');
+        echo "ADDED";
+    } else if($groupStatus = 'membersonly') {
+        // Send request to members only group
+        addMember($_POST["grp"], $_SESSION["userID"], 'request');
+    } else {
+        // Can't invite yourself to hidden groups
+        header('HTTP/1.1 500 This group is hidden');
+    }
+    header('HTTP/1.1 200');
+} else if($_POST["role"] == 'none' and $currentRole != 'none') {
+    // Remove yourself from a group
+    deleteMember($_POST["grp"], $_SESSION["userID"]);
+} else {
+    echo "failure";
+    header('HTTP/1.1 500 Wrong argument given for role');
+}
\ No newline at end of file
diff --git a/website/public/API/getGrouprole.php b/website/public/API/getGrouprole.php
new file mode 100644
index 0000000..453ccd5
--- /dev/null
+++ b/website/public/API/getGrouprole.php
@@ -0,0 +1,12 @@
+<?php
+
+session_start();
+
+if(empty($_POST["grp"])) {
+    header('HTTP/1.1 500 Non enough arguments');
+}
+
+require_once("../../queries/group_page.php");
+
+echo selectGroupRole($_POST["grp"]);
+
diff --git a/website/public/group.php b/website/public/group.php
index a84c163..72da9c8 100644
--- a/website/public/group.php
+++ b/website/public/group.php
@@ -40,12 +40,15 @@ if ($group["role"] == "mod" OR $group["role"] == "admin") {
 ?>
 
 <script src="js/masonry.js"></script>
+<script src="js/groupButtons.js"></script>
 <script src="js/post.js"></script>
 <script>
     $(document).ready(function() {
         userID = 0;
         groupID = <?= $group["groupID"] ?>;
 
+        placeGroupButtons();
+
         masonry(<?= $masonry_mode ?>);
     });
 </script>
diff --git a/website/public/js/groupButtons.js b/website/public/js/groupButtons.js
new file mode 100644
index 0000000..0f1b6bf
--- /dev/null
+++ b/website/public/js/groupButtons.js
@@ -0,0 +1,33 @@
+function placeGroupButtons() {
+    $.post("API/getGrouprole.php", { grp: groupID })
+        .done(function(data) {
+            var $buttonContainer = $("div.group-button-container");
+
+            if(data == 'none') {
+                $buttonContainer.append(
+                    "<button class='green group-button' value='request'>" +
+                    "<i class='fa fa-plus'></i> Voeg toe" +
+                    "</button>");
+            } else if(data == 'request') {
+                $buttonContainer.append(
+                    "<button class='red group-button' value='none'>" +
+                    "<i class='fa fa-times'></i> Trek verzoek in" +
+                    "</button>");
+            } else {
+                $buttonContainer.append(
+                    "<button class='red group-button' value='none'>" +
+                    "<i class='fa fa-times'></i> Verlaat groep" +
+                    "</button>");
+            }
+
+            $buttonContainer.children().click(function() {
+                $.post("API/editMembership.php", { grp: groupID, role: this.value })
+                    .done(function() {
+                        $buttonContainer.children().remove();
+                        placeGroupButtons();
+                    }).fail(function() {
+                });
+            });
+
+    });
+}
\ No newline at end of file
diff --git a/website/public/styles/main.css b/website/public/styles/main.css
index 7fc03e1..94fdea9 100644
--- a/website/public/styles/main.css
+++ b/website/public/styles/main.css
@@ -102,6 +102,7 @@ p {
 
 .group-picture {
     border-radius: 5px;
+    border: none;
 }
 
 .item-box, .item-box-full-width {
diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css
index 421e781..d2bdab4 100644
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -18,7 +18,7 @@
     display: inline-block;
 }
 
-.friend-button-container button, .status-buttons-container button {
+.friend-button-container button, .status-buttons-container button, .group-button-container button {
     display: block;
 
     margin: 7px 0;
@@ -27,6 +27,10 @@
     font-size: 18px;
 }
 
+.group-button-container button {
+    float: right;
+}
+
 .empty-button {
     background: none;
     cursor: auto;
@@ -51,8 +55,18 @@
     width: 150px;
     height: 150px;
     margin-bottom: -45px;
+
+    object-fit: cover;
+    vertical-align: middle;
 }
 
+.group-picture {
+    border: none;
+    margin-bottom: 0;
+    margin-right: 15px;
+}
+
+
 /* Old */
 
 .profile-box h1.profile-username {
diff --git a/website/queries/group_member.php b/website/queries/group_member.php
index cea4dde..aad2868 100644
--- a/website/queries/group_member.php
+++ b/website/queries/group_member.php
@@ -54,3 +54,48 @@ function searchSomeOwnGroups($n, $m, $search) {
 
     return json_encode($stmt->fetchAll());
 }
+
+function addMember($groupID, $userID, $role) {
+    $stmt = prepareQuery("
+    INSERT INTO
+      `group_member` (`userID`, `groupID`, `role`)
+    VALUES
+      (:userID, :groupID, :role)
+    ");
+
+    $stmt->bindParam(':userID', $userID);
+    $stmt->bindParam(':groupID', $groupID);
+    $stmt->bindParam(':role', $role);
+    return $stmt->execute();
+}
+
+function changeMember($groupID, $userID, $role) {
+    $stmt = prepareQuery("
+    UPDATE
+      `group_member`
+    SET
+      `role` = :role
+    WHERE
+      `userID` = :userID AND
+      `groupID` = :groupID
+    ");
+
+    $stmt->bindParam(':userID', $userID);
+    $stmt->bindParam(':groupID', $groupID);
+    $stmt->bindParam(':role', $role);
+    return $stmt->execute();
+}
+
+function deleteMember($groupID, $userID) {
+    $stmt = prepareQuery("
+    DELETE FROM
+      `group_member`
+    WHERE
+      `userID` = :userID AND
+      `groupID` = :groupID
+    ");
+
+    $stmt->bindParam(':userID', $userID);
+    $stmt->bindParam(':groupID', $groupID);
+    return $stmt->execute();
+}
\ No newline at end of file
diff --git a/website/queries/group_page.php b/website/queries/group_page.php
index 83911f8..511ff4d 100644
--- a/website/queries/group_page.php
+++ b/website/queries/group_page.php
@@ -58,6 +58,23 @@ function selectGroupRole(int $groupID) {
     return $stmt->fetch()["role"];
 }
 
+function selectGroupStatus(int $groupID) {
+    $stmt = prepareQuery("
+        SELECT
+          `status`
+        FROM
+          `group_page`
+        WHERE
+          `groupID` = :groupID
+    ");
+
+    $stmt->bindParam(':groupID', $groupID, PDO::PARAM_INT);
+    if(!$stmt->execute()) {
+        return False;
+    }
+    return $stmt->fetch()["status"];
+}
+
 function selectGroupMembers(int $groupID) {
     $stmt = prepareQuery("
         SELECT
diff --git a/website/views/group.php b/website/views/group.php
index f2f797d..c12b552 100644
--- a/website/views/group.php
+++ b/website/views/group.php
@@ -1,11 +1,10 @@
 <div class="content">
     <div class="profile-box platform">
-        <img class="left main-picture" src="<?= $group['picture'] ?>">
-        <div class="profile-button">
-            <p><img src="img/leave-group.png"> Groep verlaten</p>
-        </div>
+        <img class="left main-picture group-picture" src="<?= $group['picture'] ?>">
+        <div class="group-button-container"></div>
         <h1 class="profile-username"><?= $group['name'] ?></h1>
         <p><?= $group['description'] ?></p>
+
     </div>
 
     <div class="item-box-full-width platform">