diff --git a/libraries/User.php b/libraries/User.php
index e8916a3..3c65517 100644
--- a/libraries/User.php
+++ b/libraries/User.php
@@ -358,11 +358,6 @@ class User
             return [0, 'USER_NOT_EXIST'];
         }
 
-        // Check if the user has this user a friend
-        if (!$this->isFriends($uid)) {
-            return [0, 'ALREADY_REMOVED'];
-        }
-
         // Remove friend
         Database::delete('friends', [
             'user_id' => [$this->id, '='],
diff --git a/libraries/Users.php b/libraries/Users.php
index 23bdeb5..7a552e7 100644
--- a/libraries/Users.php
+++ b/libraries/Users.php
@@ -465,7 +465,7 @@ class Users
         // Send the message
         Utils::sendMail(
             [
-                $user->email() => $user->username,
+                $user->email => $user->username,
             ],
             Config::get('sitename') . ' Activation Mail',
             $message
diff --git a/public/content/data/yuuno/css/yuuno.css b/public/content/data/yuuno/css/yuuno.css
index 7cce262..100f0f9 100644
--- a/public/content/data/yuuno/css/yuuno.css
+++ b/public/content/data/yuuno/css/yuuno.css
@@ -1122,14 +1122,15 @@ a.default:active {
     }
 
     #notifications > div > .notification-close {
-        height: 40px;
-        width: 40px;
+        height: 40px !important;
+        width: 40px !important;
         margin: 0;
-        padding: 0;
+        padding: 0 !important;
         border: 0;
         margin-right: 4px;
         visibility: visible;
         flex-shrink: 0;
+        font-size: 2em !important;
     }
 
     #notifications > div > .notification-close > div {
diff --git a/public/settings.php b/public/settings.php
index b69deeb..2edafc4 100644
--- a/public/settings.php
+++ b/public/settings.php
@@ -1222,7 +1222,7 @@ if (Users::checkLogin()) {
                     'menu' => true,
                 ],
             ],
-        ],
+        ]/*,
         'messages' => [
             'title' => 'Messages',
             'modes' => [
@@ -1259,7 +1259,7 @@ if (Users::checkLogin()) {
                     'menu' => false,
                 ],
             ],
-        ],
+        ]*/,
         'notifications' => [
             'title' => 'Notifications',
             'modes' => [
diff --git a/sakura.php b/sakura.php
index 814904d..3aec30a 100644
--- a/sakura.php
+++ b/sakura.php
@@ -8,7 +8,7 @@
 namespace Sakura;
 
 // Define Sakura version
-define('SAKURA_VERSION', '20160117');
+define('SAKURA_VERSION', '20160118');
 define('SAKURA_VLABEL', 'Amethyst');
 define('SAKURA_COLOUR', '#9966CC');
 
diff --git a/templates/yuuno/elements/indexPanel.twig b/templates/yuuno/elements/indexPanel.twig
index 86ca831..20d11b7 100644
--- a/templates/yuuno/elements/indexPanel.twig
+++ b/templates/yuuno/elements/indexPanel.twig
@@ -32,7 +32,6 @@
         All active users in the past {{ sakura.onlineTimeout / 60 }} minute{% if sakura.onlineTimeout != 60 %}s{% endif %}
         <table class="panelTable">
             {% for amount,onlineUser in stats.onlineUsers %}
-            {% if amount != (stats.onlineUsers|length - 1) %}, {% endif %}
             <tr><td style="text-align: left;"><a href="{{ urls.format('USER_PROFILE', [onlineUser.id]) }}" style="font-weight: bold; color: {{ onlineUser.colour }};" class="default">{{ onlineUser.username }}</a></td><td title="{{ onlineUser.lastOnline|date(sakura.dateFormat) }}" style="text-align: right;">{{ onlineUser.elapsed.lastOnline }}</td></tr>
             {% endfor %}
         </table>
diff --git a/templates/yuuno/global/master.twig b/templates/yuuno/global/master.twig
index b7f6c0b..48c5379 100644
--- a/templates/yuuno/global/master.twig
+++ b/templates/yuuno/global/master.twig
@@ -109,7 +109,7 @@
                 }
             {% endif %}
 
-            {% if php.self == '/authenticate.php' and not sakura.lockAuth %}
+            {% if php.self == '/authenticate.php' and not (sakura.lockAuth or session.checkLogin) %}
 
                 // AJAX Form Submission
                 var forms = {
@@ -171,7 +171,7 @@
                         <!-- User menu, displayed on right side of the bar. -->
                         {% if session.checkLogin %}
                             <a class="menu-item avatar" href="{{ urls.format('USER_PROFILE', [user.id]) }}" title="Logged in as {{ user.username }}" style="background-image: url('{{ urls.format('IMAGE_AVATAR', [user.id]) }}'); width: auto; color: {{ user.colour }}; border-color: {{ user.colour }}; font-weight: 700;"></a>
-                            <a class="menu-item fa-envelope" href="{{ urls.format('SETTING_CAT', ['messages']) }}" title="Messages"></a>
+                            {#<a class="menu-item fa-envelope" href="{{ urls.format('SETTING_CAT', ['messages']) }}" title="Messages"></a>#}
                             {% if user.permission(constant('Sakura\\Perms\\Manage::USE_MANAGE'), constant('Sakura\\Perms::MANAGE')) %}
                                 <a class="menu-item fa-gavel" href="{{ urls.format('MANAGE_INDEX') }}" title="Manage"></a>
                             {% endif %}