diff --git a/_sakura/templates/yuuno/elements/settingsNav.tpl b/_sakura/templates/yuuno/elements/settingsNav.tpl
index 7e2f690..193106e 100644
--- a/_sakura/templates/yuuno/elements/settingsNav.tpl
+++ b/_sakura/templates/yuuno/elements/settingsNav.tpl
@@ -5,6 +5,8 @@
     <div>General</div>
     <a href="/settings/">Home</a>
     <a href="/settings/profile">Edit Profile</a>
+    <a href="/settings/friends">Friends</a>
+    <a href="/settings/groups">Groups</a>
     <div>Messages</div>
     <a href="/messages/inbox">Inbox</a>
     <a href="/messages/sent">Sent</a>
diff --git a/_sakura/templates/yuuno/settings/avatar.tpl b/_sakura/templates/yuuno/settings/avatar.tpl
index f3feaee..1b019fb 100644
--- a/_sakura/templates/yuuno/settings/avatar.tpl
+++ b/_sakura/templates/yuuno/settings/avatar.tpl
@@ -11,7 +11,23 @@
                 <div>Your avatar which is displayed all over the site and on your profile.</div>
                 <div>Maximum image size is 500x500, minimum image size is 20x20, maximum file size is 10 MB.</div>
             </div>
-            
+            <form enctype="multipart/form-data" method="post" action="{{ setting.action }}">
+                <input type="hidden" name="sessid" value="{{ php.session }}" />
+                <input type="hidden" name="timestamp" value="{{ php.time }}" />
+                <input type="hidden" name="mode" value="avatar" />
+                <input type="hidden" name="MAX_FILE_SIZE" value="10000000" />
+                <div style="text-align: center;">
+                    <div>
+                        <img src="/a/{{ user.data.id }}" alt="Your Avatar" class="default-avatar-setting" />
+                    </div>
+                    <div>
+                        <input type="file" name="avatar" />
+                    </div>
+                    <div>
+                        <input type="submit" value="Submit" name="submit" class="inputStyling" />
+                    </div>
+                </div>
+            </form>
         </div>
         <div class="clear"></div>
     </div>
diff --git a/_sakura/templates/yuuno/settings/friends.tpl b/_sakura/templates/yuuno/settings/friends.tpl
new file mode 100644
index 0000000..722dc95
--- /dev/null
+++ b/_sakura/templates/yuuno/settings/friends.tpl
@@ -0,0 +1,17 @@
+{% include 'global/header.tpl' %}
+    <div class="content settings messages">
+        <div class="content-right content-column">
+            {% include 'elements/settingsNav.tpl' %}
+        </div>
+        <div class="content-left content-column">
+            <div class="head">
+                {{ page.title }}
+            </div>
+            <div class="settings-explanation">
+                <div>Manage your friends.</div>
+            </div>
+            
+        </div>
+        <div class="clear"></div>
+    </div>
+{% include 'global/footer.tpl' %}
diff --git a/_sakura/templates/yuuno/settings/groups.tpl b/_sakura/templates/yuuno/settings/groups.tpl
new file mode 100644
index 0000000..5793039
--- /dev/null
+++ b/_sakura/templates/yuuno/settings/groups.tpl
@@ -0,0 +1,18 @@
+{% include 'global/header.tpl' %}
+    <div class="content settings messages">
+        <div class="content-right content-column">
+            {% include 'elements/settingsNav.tpl' %}
+        </div>
+        <div class="content-left content-column">
+            <div class="head">
+                {{ page.title }}
+            </div>
+            <div class="settings-explanation">
+                <div>The background that is displayed on your profile.</div>
+                <div>Maximum image size is 2560x1440, minimum image size is 20x20, maximum file size is 10 MB.</div>
+            </div>
+            
+        </div>
+        <div class="clear"></div>
+    </div>
+{% include 'global/footer.tpl' %}
diff --git a/main/settings.php b/main/settings.php
index 13207ab..821f3e8 100644
--- a/main/settings.php
+++ b/main/settings.php
@@ -195,6 +195,8 @@ if(Users::checkLogin()) {
     $pages = [
         'home'          => ['General',          'Home'],
         'profile'       => ['General',          'Edit Profile'],
+        'friends'       => ['General',          'Friends'],
+        'groups'        => ['General',          'Groups'],
         'notifications' => ['Notifications',    'History'],
         'avatar'        => ['Aesthetics',       'Avatar'],
         'background'    => ['Aesthetics',       'Background'],
@@ -221,6 +223,11 @@ if(Users::checkLogin()) {
     // Section specific
     switch($currentPage) {
 
+        // Notification history
+        case 'friends':
+            $renderData['friends'] = Users::getFriends();
+            break;
+
         // Notification history
         case 'notifications':
             $renderData['notifs'] = array_reverse(Users::getNotifications(null, 0, false, true));