diff --git a/Plugins/SimpleStats/Cheat/Detection.cs b/Plugins/SimpleStats/Cheat/Detection.cs
index e036a2f81..5958708f9 100644
--- a/Plugins/SimpleStats/Cheat/Detection.cs
+++ b/Plugins/SimpleStats/Cheat/Detection.cs
@@ -271,7 +271,8 @@ if (totalChestKills >= 250)
     double chestAbdomenRatioLerpValueForFlag = Thresholds.Lerp(Thresholds.ChestAbdomenRatioThresholdLowSample(2.25), Thresholds.ChestAbdomenRatioThresholdHighSample(2.25), lerpAmount) + marginOfError;
     double chestAbdomenLerpValueForBan = Thresholds.Lerp(Thresholds.ChestAbdomenRatioThresholdLowSample(3.0), Thresholds.ChestAbdomenRatioThresholdHighSample(3.0), lerpAmount) + marginOfError;
 
-    double currentChestAbdomenRatio = HitLocationCount[IW4Info.HitLocation.torso_upper] / (double)HitLocationCount[IW4Info.HitLocation.torso_lower];
+                double currentChestAbdomenRatio = stats.HitLocations.Single(hl => hl.Location == IW4Info.HitLocation.torso_upper).HitCount /
+                    stats.HitLocations.Single(hl => hl.Location == IW4Info.HitLocation.torso_lower).HitCount;
 
     if (currentChestAbdomenRatio > chestAbdomenRatioLerpValueForFlag)
     {
@@ -284,8 +285,8 @@ if (totalChestKills >= 250)
             Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
             Log.WriteDebug($"**MaxRatio {chestAbdomenLerpValueForBan}");
             var sb = new StringBuilder();
-            foreach (var kvp in HitLocationCount)
-                sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+            foreach (var location in stats.HitLocations)
+                sb.Append($"HitLocation: {location.Location} -> {location.HitCount}\r\n");
             Log.WriteDebug(sb.ToString());
             //  Log.WriteDebug($"ThresholdReached: {AboveThresholdCount}");
 
@@ -305,8 +306,8 @@ if (totalChestKills >= 250)
             Log.WriteDebug($"**Ratio {currentChestAbdomenRatio}");
             Log.WriteDebug($"**MaxRatio {chestAbdomenRatioLerpValueForFlag}");
             var sb = new StringBuilder();
-            foreach (var kvp in HitLocationCount)
-                sb.Append($"HitLocation: {kvp.Key} -> {kvp.Value}\r\n");
+            foreach (var location in stats.HitLocations)
+                sb.Append($"HitLocation: {location.Location} -> {location.HitCount}\r\n");
             Log.WriteDebug(sb.ToString());
             // Log.WriteDebug($"ThresholdReached: {AboveThresholdCount}");
 
diff --git a/Plugins/SimpleStats/Models/EFClientStatistics.cs b/Plugins/SimpleStats/Models/EFClientStatistics.cs
index f929ba4c8..ecd15eb65 100644
--- a/Plugins/SimpleStats/Models/EFClientStatistics.cs
+++ b/Plugins/SimpleStats/Models/EFClientStatistics.cs
@@ -42,7 +42,7 @@ namespace StatsPlugin.Models
         [NotMapped]
         public float AverageHitOffset
         {
-            get => (float)Math.Round(HitLocations.Sum(c => c.HitOffsetAverage) / HitLocations.Where(c => c.HitOffsetAverage > 0).Count(), 4);
+            get => (float)Math.Round(HitLocations.Sum(c => c.HitOffsetAverage) / Math.Max(1, HitLocations.Where(c => c.HitOffsetAverage > 0).Count()), 4);
         }
         [NotMapped]
         public int SessionKills { get; set; }
diff --git a/Plugins/SimpleStats/Plugin.cs b/Plugins/SimpleStats/Plugin.cs
index 0da3d0f70..05d6b2f8d 100644
--- a/Plugins/SimpleStats/Plugin.cs
+++ b/Plugins/SimpleStats/Plugin.cs
@@ -129,7 +129,7 @@ namespace StatsPlugin
                          (double)clientStats.Where(c => c.HitLocations.Count > 0)
                             .Sum(c => c.HitLocations.Where(hl => hl.Location != IW4Info.HitLocation.none).Sum(f => f.HitCount)), 2);
 
-                    hitOffsetAverage = clientStats.Sum(c => c.AverageHitOffset) / clientStats.Where(c => c.AverageHitOffset > 0).Count();
+                    hitOffsetAverage = clientStats.Sum(c => c.AverageHitOffset) / Math.Max(1, clientStats.Where(c => c.AverageHitOffset > 0).Count());
                 }
 
                 return new List<ProfileMeta>()
diff --git a/WebfrontCore/Controllers/ClientController.cs b/WebfrontCore/Controllers/ClientController.cs
index 237d54c9a..7020b6f0e 100644
--- a/WebfrontCore/Controllers/ClientController.cs
+++ b/WebfrontCore/Controllers/ClientController.cs
@@ -45,7 +45,7 @@ namespace WebfrontCore.Controllers
             var administeredPenaltiesMeta = await Manager.GetPenaltyService()
                 .ReadGetClientPenaltiesAsync(client.ClientId, false);
 
-            if (client.Level > SharedLibrary.Objects.Player.Permission.Trusted)
+            if (Authorized && client.Level > SharedLibrary.Objects.Player.Permission.Trusted)
                 clientDto.Meta.Add(new ProfileMeta()
                 {
                     Key = "Masked",
diff --git a/WebfrontCore/Controllers/ServerController.cs b/WebfrontCore/Controllers/ServerController.cs
index 645453402..fadf0a61d 100644
--- a/WebfrontCore/Controllers/ServerController.cs
+++ b/WebfrontCore/Controllers/ServerController.cs
@@ -30,7 +30,8 @@ namespace WebfrontCore.Controllers
                 Players = s.Players.Where(p => p != null).Select(p => new PlayerInfo
                 {
                     Name = p.Name,
-                    ClientId = p.ClientId
+                    ClientId = p.ClientId,
+                    Level = p.Level.ToString()
                 }).ToList(),
                 ChatHistory = s.ChatHistory.OrderBy(c => c.Time).Take((int)Math.Ceiling(s.ClientNum / 2.0)).ToArray(),
                 PlayerHistory = s.PlayerHistory.ToArray()
diff --git a/WebfrontCore/Views/Server/_ClientActivity.cshtml b/WebfrontCore/Views/Server/_ClientActivity.cshtml
index b7f4f2b42..a2843b4ce 100644
--- a/WebfrontCore/Views/Server/_ClientActivity.cshtml
+++ b/WebfrontCore/Views/Server/_ClientActivity.cshtml
@@ -8,7 +8,7 @@
     @{
         for (int i = 0; i < Model.ChatHistory.Length; i++)
         {
-            string message = "&ndash; " + @Model.ChatHistory[i].Message;
+            string message = @Model.ChatHistory[i].Message;
             if (Model.ChatHistory[i].Message == "CONNECTED")
             {
                 <span class="text-light"><span class="oi oi-account-login mr-2 text-success"> </span>@Model.ChatHistory[i].Name</span><br />
@@ -20,7 +20,7 @@
             }
             if (Model.ChatHistory[i].Message != "CONNECTED" && Model.ChatHistory[i].Message != "DISCONNECTED")
             {
-                <span class="text-light">@Model.ChatHistory[i].Name</span><span> @Html.Raw(@message) </span><br />
+                <span class="text-light">@Model.ChatHistory[i].Name</span><span> &mdash; @message.Substring(0, Math.Min(50, message.Length - 1)) </span><br />
             }
         }
     }
@@ -31,7 +31,8 @@
             @{
                 for (int i = 0; i < half; i++)
                 {
-                    <span>@Html.ActionLink(Model.Players[i].Name, "ProfileAsync", "Client", new { id = Model.Players[i].ClientId })</span><br />
+                    string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].Level.ToLower()}";
+                    <span>@Html.ActionLink(Model.Players[i].Name, "ProfileAsync", "Client", new { id = Model.Players[i].ClientId }, new { @class=levelColorClass })</span><br />
                 }
             }
         </div>
@@ -39,7 +40,8 @@
             @{
                 for (int i = half; i < Model.ClientCount; i++)
                 {
-                    <span>@Html.ActionLink(Model.Players[i].Name, "ProfileAsync", "Client", new { id = Model.Players[i].ClientId })</span><br />
+                    string levelColorClass = !ViewBag.Authorized ? "" : $"level-color-{Model.Players[i].Level.ToLower()}";
+                    <span>@Html.ActionLink(Model.Players[i].Name, "ProfileAsync", "Client", new { id = Model.Players[i].ClientId }, new { @class = levelColorClass })</span><br />
                 }
             }
         </div>
diff --git a/WebfrontCore/Views/Shared/_Layout.cshtml b/WebfrontCore/Views/Shared/_Layout.cshtml
index fbad5595e..a28d73a56 100644
--- a/WebfrontCore/Views/Shared/_Layout.cshtml
+++ b/WebfrontCore/Views/Shared/_Layout.cshtml
@@ -46,6 +46,7 @@
         </nav>
     </header>
 
+    <!-- Main Modal -->
     <div class="modal fade" id="mainModal" tabindex="-1" role="dialog" aria-labelledby="mainModalLabel" aria-hidden="true">
         <div class="modal-dialog" role="document">
             <div class="modal-content bg-dark">
@@ -60,6 +61,7 @@
             </div>
         </div>
     </div>
+    <!-- End Main Modal -->
 
     <!-- Action Modal -->
     <div class="modal fade" id="actionModal" tabindex="-1" role="dialog" aria-labelledby="actionModalLabel" aria-hidden="true">
diff --git a/WebfrontCore/wwwroot/css/profile.css b/WebfrontCore/wwwroot/css/profile.css
index 2adefcbb0..fd0894c29 100644
--- a/WebfrontCore/wwwroot/css/profile.css
+++ b/WebfrontCore/wwwroot/css/profile.css
@@ -3,14 +3,14 @@
 }
 
 .level-color-user, .level-color-guest {
-    color: rgba(255, 255, 255, 0.85);
+    color: rgba(255, 255, 255, 0.7);
 }
 
 .level-bgcolor-user, .level-bgcolor-guest {
     background-color: rgba(255, 255, 255, 0.85);
 }
 
-.level-color-trusted, .level-color-user {
+.level-color-trusted {
     color: rgba(116,147,99,1);
 }
 
@@ -158,3 +158,7 @@
     .profile-action:hover {
         opacity: 0.75;
     }
+
+#profile_events span {
+    word-break: break-all;
+}
diff --git a/WebfrontCore/wwwroot/js/profile.js b/WebfrontCore/wwwroot/js/profile.js
index 8d2f04c38..6f9e5cd66 100644
--- a/WebfrontCore/wwwroot/js/profile.js
+++ b/WebfrontCore/wwwroot/js/profile.js
@@ -57,12 +57,17 @@ $(document).ready(function () {
         const ip = $(this).data("ip");
         $.getJSON("http://ip-api.com/json/" + ip)
             .done(function (response) {
-                $('.modal-title').text(ip);
-                $('.modal-body').text("");
-                $('.modal-body').append("ASN &mdash; " + response["as"] + "<br/>");
-                $('.modal-body').append("ISP &mdash; " + response["isp"] + "<br/>");
-                $('.modal-body').append("Organization &mdash; " + response["org"] + "<br/>");
-                $('.modal-body').append("Location &mdash; " + response["city"] + ", " + response["regionName"] + ", " + response["country"] + "<br/>");
+                $('#mainModal .modal-title').text(ip);
+                $('#mainModal .modal-body').text("");
+                $('#mainModal .modal-body').append("ASN &mdash; " + response["as"] + "<br/>");
+                $('#mainModal .modal-body').append("ISP &mdash; " + response["isp"] + "<br/>");
+                $('#mainModal .modal-body').append("Organization &mdash; " + response["org"] + "<br/>");
+                $('#mainModal .modal-body').append("Location &mdash; " + response["city"] + ", " + response["regionName"] + ", " + response["country"] + "<br/>");
+                $('#mainModal').modal();
+            })
+            .fail(function (jqxhr, textStatus, error) {
+                $('#mainModal .modal-title').text("Error");
+                $('#mainModal .modal-body').html('<span class="text-danger">&mdash;'+ error + '</span>');
                 $('#mainModal').modal();
             });
     });