diff --git a/website/public/styles/main.css b/website/public/styles/main.css
index 94fdea9..226a96d 100644
--- a/website/public/styles/main.css
+++ b/website/public/styles/main.css
@@ -102,7 +102,6 @@ p {
 
 .group-picture {
     border-radius: 5px;
-    border: none;
 }
 
 .item-box, .item-box-full-width {
@@ -291,19 +290,6 @@ div[data-title]:hover:after {
     vertical-align: middle;
 }
 
-::-webkit-scrollbar {
-    width: 5px;
-    height: 5px;
-}
-::-webkit-scrollbar-track {
-    background: none;
-}
-::-webkit-scrollbar-thumb {
-    -webkit-border-radius: 20px;
-    border-radius: 20px;
-    background: #4CAF50;
-}
-
 @media only screen and (max-width: 1080px) {
     body {
         font-size: 28px!important;
diff --git a/website/public/styles/profile.css b/website/public/styles/profile.css
index 1bacafa..0d792ac 100644
--- a/website/public/styles/profile.css
+++ b/website/public/styles/profile.css
@@ -11,7 +11,7 @@
     display: inline-block;
 }
 
-.friend-button-container {
+.friend-button-container, .group-button-container {
     position: relative;
     float: right;
     width: 200px;
@@ -62,7 +62,6 @@
 
 .group-picture {
     border: none;
-    margin-bottom: 0;
     margin-right: 15px;
 }
 
diff --git a/website/queries/friendship.php b/website/queries/friendship.php
index a16d859..7355af2 100644
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -10,8 +10,8 @@ function selectLimitedFriends($userID, $limit) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            LEFT(`username`, 17) as `username`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
                 '../img/avatar-standard.png'
@@ -50,8 +50,8 @@ function selectAllFriends($userID) {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            LEFT(`username`, 17) as `username`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
                 '../img/avatar-standard.png'
@@ -85,8 +85,8 @@ function selectAllFriendRequests() {
     $stmt = prepareQuery("
         SELECT
             `userID`,
-            `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            LEFT(`username`, 17) as `username`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
                 '../img/avatar-standard.png'
@@ -235,8 +235,9 @@ function searchSomeFriends($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
             `userID`,
-            `username`,
-            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+            
+            LEFT(`username`, 17) as `username`,
+            LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
             IFNULL(
                 `profilepicture`,
                 '../img/avatar-standard.png'
diff --git a/website/queries/private_message.php b/website/queries/private_message.php
index 4ac04a7..3b88563 100644
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -95,7 +95,7 @@ function getNewChatMessages($lastID, $destination) {
 function selectAllUnreadChat() {
     $stmt = prepareQuery("
     SELECT
-      LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) AS `fullname`,
+      LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
       `user`.`userID`,
       IFNULL(
           `profilepicture`,
diff --git a/website/queries/user.php b/website/queries/user.php
index 33a85a1..101c70c 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -345,12 +345,12 @@ function searchSomeUsers($n, $m, $search) {
     $stmt = prepareQuery("
     SELECT
         `userID`,
-        `username`,
+        LEFT(`username`, 17) as `username`,
         IFNULL(
             `profilepicture`,
             '../img/avatar-standard.png'
         ) AS profilepicture,
-        LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 15) as `fullname`,
+        LEFT(CONCAT(`user`.`fname`, ' ', `user`.`lname`), 12) as `fullname`,
         CASE `lastactivity` >= DATE_SUB(NOW(),INTERVAL 15 MINUTE)
           WHEN TRUE THEN 'online'
           WHEN FALSE THEN 'offline'
diff --git a/website/views/group.php b/website/views/group.php
index c12b552..d192123 100644
--- a/website/views/group.php
+++ b/website/views/group.php
@@ -1,12 +1,17 @@
 <div class="content">
-    <div class="profile-box platform">
-        <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 class="user-box">
+        <img class="group-picture main-picture" src="<?= $group["picture"] ?>"><br />
+        <div class="platform">
+            <div class="status-buttons-container">
+                <button disabled class="gray"><?= $group["status"] ?></button>
+            </div>
+            <div class="group-button-container"></div>
+            <div class="profile-info">
+                <h2><?= $group["name"]?></h2>
+                <?= $group["description"] ?>
+            </div>
+        </div>
     </div>
-
     <div class="item-box-full-width platform">
         <h2>Leden (<?= $group['members'] ?>)</h2>
         <p>
diff --git a/website/views/settings-view.php b/website/views/settings-view.php
index e3cfd36..4a54ec5 100644
--- a/website/views/settings-view.php
+++ b/website/views/settings-view.php
@@ -17,6 +17,7 @@ $settings = getSettings();
                     <input type="text"
                            name="fname"
                            id="fname"
+                           maxlength="63"
                            placeholder="Voornaam"
                            title="Voornaam"
                            value="<?=$settings["fname"]?>"
@@ -27,6 +28,7 @@ $settings = getSettings();
                     <input type="text"
                            name="lname"
                            id="lname"
+                           maxlength="63"
                            placeholder="Achternaam"
                            value="<?=$settings["lname"]?>"
                     >
@@ -36,6 +38,7 @@ $settings = getSettings();
                     <input type="text"
                            name="location"
                            id="location"
+                           maxlength="50"
                            placeholder="Locatie"
                            value="<?=$settings["location"]?>"
                     >
@@ -186,6 +189,7 @@ $settings = getSettings();
                     <label for="email-old">Huidig Email </label>
                     <input type="email"
                            id="email-old"
+                           maxlength="255"
                            value="<?=$settings["email"]?>"
                            disabled
                     >
@@ -194,6 +198,7 @@ $settings = getSettings();
                     <label for="email">Nieuw Email</label>
                     <input type="email"
                            name="email"
+                           maxlength="255"
                            id="email"
                            placeholder="Nieuw Email"
                     >
@@ -203,14 +208,16 @@ $settings = getSettings();
                     <input type="email"
                            name="email-confirm"
                            id="email-confirm"
+                           maxlength="255"
                            placeholder="Bevestig Email"
                     >
                 </li>
                 <li>
                     <button type="submit"
                             name="form"
-                            value="email"
-                    >Verander Email</button>
+                            value="email">
+                        Verander Email
+                    </button>
                 </li>
             </ul>
         </form>