diff --git a/_sakura/templates/misaki/main/profile.tpl b/_sakura/templates/misaki/main/profile.tpl
index 01b71ee..ecdc2ee 100755
--- a/_sakura/templates/misaki/main/profile.tpl
+++ b/_sakura/templates/misaki/main/profile.tpl
@@ -66,63 +66,80 @@
         </div>
         <div class="profileContainer" id="profileContent">
             <div class="userDataBar">
-            {% if not profileHidden and (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %}
-                <div class="profilePlatform hierarchyContainer">
-                    <div class="inner">
-                        <ul class="hierarchies">
-                            {% if profile.checkPremium[0] %}
-                                <li class="tenshi">Tenshi</li>
-                            {% endif %}
-                            {% if profile.checkPermission('MANAGE', 'USE_MANAGE') %}
-                                <li class="staff">Staff</li>
-                            {% endif %}
-                            {% if false %}
-                                <li class="developer">Developer</li>
-                            {% endif %}
-                            {% if false %}
-                                <li class="alumnii">Alumnii</li>
-                            {% endif %}
-                        </ul>
+            {% if not profileHidden %}
+                {% if (profile.checkPremium[0] or profile.checkPermission('MANAGE', 'USE_MANAGE')) %}
+                    <div class="profilePlatform hierarchyContainer">
+                        <div class="inner">
+                            <ul class="hierarchies">
+                                {% if profile.checkPremium[0] %}
+                                    <li class="tenshi">Tenshi</li>
+                                {% endif %}
+                                {% if profile.checkPermission('MANAGE', 'USE_MANAGE') %}
+                                    <li class="staff">Staff</li>
+                                {% endif %}
+                                {% if false %}
+                                    <li class="developer">Developer</li>
+                                {% endif %}
+                                {% if false %}
+                                    <li class="alumnii">Alumnii</li>
+                                {% endif %}
+                            </ul>
+                        </div>
                     </div>
-                </div>
-                <div class="profilePlatform userAccounts">
-                    <div class="inner">
-                        {% if session.checkLogin %}
-                            {% if profile.profileFields %}
-                                {% for name,field in profile.profileFields %}
-                                <div class="field">
-                                    <div>{{ field.name }}</div>
-                                    <div>
-                                    {% if name == 'youtube' %}
-                                        <a href="https://youtube.com/{% if field.youtubetype == 'true' %}channel{% else %}user{% endif %}/{{ field.value }}" class="default">{% if field.youtubetype == 'true' %}{{ profile.data.username }}'s Channel{% else %}{{ field.value }}{% endif %}</a>
+                    {% endif %}
+                    {% if session.checkLogin %}
+                        <div class="profilePlatform userActions">
+                            <div class="inner">
+                                <ul class="actions">
+                                    {% if user.data.user_id == profile.data.user_id %}
+                                        <li class="edit"><a title="Edit your profile" href="{{ urls.format('SETTING_MODE', ['general', 'profile']) }}">Edit</a></li>
+                                        <li class="settings"><a title="Change your settings" href="{{ urls.format('SETTINGS_INDEX') }}">Settings</a></li>
                                     {% else %}
-                                        {% if field.islink %}
-                                            <a href="{{ field.link }}">
-                                        {% endif %}
-                                        {{ field.value }}
-                                        {% if field.islink %}
-                                            </a>
-                                        {% endif %}
+                                        <li class="{% if user.checkFriends(profile.data.user_id) == 2 %}mutualFriend{% elseif user.checkFriends(profile.data.user_id) == 1 %}pendingFriend{% else %}addFriend{% endif %}"><a href="{% if user.checkFriends(profile.data.user_id) == 0 %}{{ urls.format('FRIEND_ADD', [profile.data.user_id, php.sessionid, php.time, sakura.currentPage]) }}{% else %}{{ urls.format('FRIEND_REMOVE', [profile.data.user_id, php.sessionid, php.time, sakura.currentPage]) }}{% endif %}">{% if user.checkFriends(profile.data.user_id) == 0 %}Add friend{% else %}Friends{% endif %}</a></li>
+                                        <li class="report"><a href="{{ urls.format('USER_REPORT', [profile.data.user_id]) }}">Report</a></li>
                                     {% endif %}
+                                </ul>
+                            </div>
+                        </div>
+                    {% endif %}
+                    <div class="profilePlatform userAccounts">
+                        <div class="inner">
+                            {% if session.checkLogin %}
+                                {% if profile.profileFields %}
+                                    {% for name,field in profile.profileFields %}
+                                    <div class="field">
+                                        <div>{{ field.name }}</div>
+                                        <div>
+                                        {% if name == 'youtube' %}
+                                            <a href="https://youtube.com/{% if field.youtubetype == 'true' %}channel{% else %}user{% endif %}/{{ field.value }}" class="default">{% if field.youtubetype == 'true' %}{{ profile.data.username }}'s Channel{% else %}{{ field.value }}{% endif %}</a>
+                                        {% else %}
+                                            {% if field.islink %}
+                                                <a href="{{ field.link }}">
+                                            {% endif %}
+                                            {{ field.value }}
+                                            {% if field.islink %}
+                                                </a>
+                                            {% endif %}
+                                        {% endif %}
+                                        </div>
+                                        <div class="clear"></div>
                                     </div>
-                                    <div class="clear"></div>
-                                </div>
-                                {% endfor %}
+                                    {% endfor %}
+                                {% else %}
+                                    <div class="noAccounts">
+                                        <div class="fa fa-question"></div>
+                                        <div class="notif">This user has not set any links yet.</div>
+                                    </div>
+                                {% endif %}
                             {% else %}
                                 <div class="noAccounts">
-                                    <div class="fa fa-question"></div>
-                                    <div class="notif">This user has not set any links yet.</div>
+                                    <div class="fa fa-exclamation-circle"></div>
+                                    <div class="notif">Log in to view the full profile.</div>
                                 </div>
                             {% endif %}
-                        {% else %}
-                            <div class="noAccounts">
-                                <div class="fa fa-exclamation-circle"></div>
-                                <div class="notif">Log in to view the full profile.</div>
-                            </div>
-                        {% endif %}
+                        </div>
                     </div>
-                </div>
-            {% endif %}
+                {% endif %}
                 <div class="profilePlatform accountStanding">
                     <div class="inner">
                         <div class="title">Account Standing</div>
diff --git a/public/content/data/misaki/css/misaki.css b/public/content/data/misaki/css/misaki.css
index 3c18d8e..b4cfa1d 100755
--- a/public/content/data/misaki/css/misaki.css
+++ b/public/content/data/misaki/css/misaki.css
@@ -538,13 +538,15 @@ a:active {
     flex-shrink: 0;
 }
 
-#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies {
+#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies,
+#profileContent > .userDataBar > .userActions > .inner > .actions {
     list-style: none;
     font-size: 2.5em;
     line-height: 1.2em;
 }
 
-#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > li:before {
+#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > li:before,
+#profileContent > .userDataBar > .userActions > .inner > .actions > li > a:before {
     font-family: "FontAwesome";
     width: 36px;
     padding-right: 3px;
@@ -554,6 +556,19 @@ a:active {
     text-shadow: 0 0 3px #fcfcfc;
 }
 
+#profileContent > .userDataBar > .userActions > .inner > .actions > li > a {
+    display: block;
+    color: inherit;
+}
+
+#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .owner {
+    color: #824ca0;
+}
+
+#profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .owner:before {
+    content: "\f0ad";
+}
+
 #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .tenshi {
     color: #ee9400;
 }
@@ -563,7 +578,7 @@ a:active {
 }
 
 #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff {
-    color: #09f;
+    color: #fa3703;
 }
 
 #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .staff:before {
@@ -571,7 +586,7 @@ a:active {
 }
 
 #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer {
-    color: #824ca0;
+    color: #6eac0a;
 }
 
 #profileContent > .userDataBar > .hierarchyContainer > .inner > .hierarchies > .developer:before {
@@ -586,6 +601,39 @@ a:active {
     content: "\f005";
 }
 
+#profileContent > .userDataBar > .userActions > .inner > .actions > .edit > a:before {
+    content: "\f044";
+}
+
+#profileContent > .userDataBar > .userActions > .inner > .actions > .settings > a:before {
+    content: "\f013";
+}
+
+#profileContent > .userDataBar > .userActions > .inner > .actions > .addFriend > a:before {
+    content: "\f234";
+}
+
+#profileContent > .userDataBar > .userActions > .inner > .actions > .mutualFriend > a:before {
+    content: "\f004";
+}
+
+#profileContent > .userDataBar > .userActions > .inner > .actions > .pendingFriend > a:before {
+    content: "\f006";
+}
+
+#profileContent > .userDataBar > .userActions > .inner > .actions > .mutualFriend:hover > a:before,
+#profileContent > .userDataBar > .userActions > .inner > .actions > .pendingFriend:hover > a:before {
+    content: "\f235";
+}
+
+#profileContent > .userDataBar > .userActions > .inner > .actions > .message > a:before {
+    content: "\f0e0";
+}
+
+#profileContent > .userDataBar > .userActions > .inner > .actions > .report > a:before {
+    content: "\f06a";
+}
+
 #profileContent > .userDataBar > .userAccounts a {
     color: inherit;
 }