diff --git a/mutes.php b/mutes.php
index 3f8c07e..0eb8208 100644
--- a/mutes.php
+++ b/mutes.php
@@ -7,7 +7,7 @@
 // <<-----------------mysql Database Connection------------>> //
 require 'includes/data/database.php';
 
-$sql = 'SELECT name, reason, muter, time, expires FROM mutes ORDER BY time DESC LIMIT 20';
+$sql = 'SELECT time,until,reason,name,banned_by_name FROM mutes INNER JOIN history on mutes.uuid=history.uuid WHERE active=1 GROUP BY name ORDER BY time DESC LIMIT 20';
 
 $retval = mysql_query($sql, $conn);
 if (!$retval) {
@@ -22,7 +22,7 @@ if (!$retval) {
         <div class="col-lg-12">
             <h1 class="page-header">Mutes</h1>
             <ol class="breadcrumb">
-                <li><a href="index">Home</a></li>
+                <li><a href="index.php">Home</a></li>
                 <li class="active">Mutes</li>
             </ol>
         </div>
@@ -47,16 +47,16 @@ if (!$retval) {
                     $timeConvert = $timeEpoch / 1000;
                     $timeResult = date('F j, Y, g:i a', $timeConvert);
                     // <<-----------------Expiration Time Converter------------>> //
-                    $expiresEpoch = $row['expires'];
+                    $expiresEpoch = $row['until'];
                     $expiresConvert = $expiresEpoch / 1000;
                     $expiresResult = date('F j, Y, g:i a', $expiresConvert);
                     ?>
                     <tr>
                         <td><?php echo "<img src='https://minotar.net/avatar/" . $row['name'] . "/25' style='margin-bottom:5px;margin-right:5px;border-radius:2px;' />" . $row['name']; ?></td>
-                        <td><?php echo "<img src='https://minotar.net/avatar/" . $row['banner'] . "/25'  style='margin-bottom:5px;margin-right:5px;border-radius:2px;' />" . $row['banner']; ?></td>
+                        <td><?php echo "<img src='https://minotar.net/avatar/" . $row['banned_by_name'] . "/25'  style='margin-bottom:5px;margin-right:5px;border-radius:2px;' />" . $row['banned_by_name']; ?></td>
                         <td style="width: 30%;"><?php echo $row['reason']; ?></td>
                         <td><?php echo $timeResult; ?></td>
-                        <td><?php if ($row['expires'] == 0) {
+                        <td><?php if ($row['until'] == 0) {
                                 echo 'Permanent Mute';
                             } else {
                                 echo $expiresResult;
diff --git a/warnings.php b/warnings.php
index 0a09464..2a90c90 100644
--- a/warnings.php
+++ b/warnings.php
@@ -7,11 +7,11 @@
 // <<-----------------mysql Database Connection------------>> //
 require 'includes/data/database.php';
 
-$sql = 'SELECT name, reason, banner, expires FROM warnings ORDER BY expires DESC LIMIT 20';
+$sql = 'SELECT time,until,reason,name,banned_by_name FROM warnings INNER JOIN history on warnings.uuid=history.uuid WHERE active=1 GROUP BY name ORDER BY time DESC LIMIT 20';
 
 $retval = mysql_query($sql, $conn);
 if (!$retval) {
-    die('Could not get data: ' . mysql_error());
+    die('Could not get data: ' . mysql_error($conn));
 }
 ?>
 <body>
@@ -50,15 +50,15 @@ if (!$retval) {
                 <tbody>
                 <?php while ($row = mysql_fetch_assoc($retval)) {
                     // <<-----------------Expiration Time Converter------------>> //
-                    $expiresEpoch = $row['expires'];
+                    $expiresEpoch = $row['until'];
                     $expiresConvert = $expiresEpoch / 1000;
                     $expiresResult = date('F j, Y, g:i a', $expiresConvert);
                     ?>
                     <tr>
                         <td><?php echo "<img src='https://minotar.net/avatar/" . $row['name'] . "/25' style='margin-bottom:5px;margin-right:5px;border-radius:2px;' />" . $row['name']; ?></td>
-                        <td><?php echo "<img src='https://minotar.net/avatar/" . $row['banner'] . "/25'  style='margin-bottom:5px;margin-right:5px;border-radius:2px;' />" . $row['banner']; ?></td>
+                        <td><?php echo "<img src='https://minotar.net/avatar/" . $row['banned_by_name'] . "/25'  style='margin-bottom:5px;margin-right:5px;border-radius:2px;' />" . $row['banned_by_name']; ?></td>
                         <td style="width: 30%;"><?php echo $row['reason']; ?></td>
-                        <td><?php if ($row['expires'] == 0) {
+                        <td><?php if ($row['until'] == 0) {
                                 echo 'Permanent Warning';
                             } else {
                                 echo $expiresResult;
