diff --git a/bans.php b/bans.php
index 9dd6f8c..6ad159f 100644
--- a/bans.php
+++ b/bans.php
@@ -16,12 +16,12 @@ foreach ($rows as $row) {
     if ($player_name === null) continue;
 
     $page->print_table_rows($row, array(
-        $page->t("table.player")      => $page->get_avatar($player_name, $row['uuid']),
-        $page->t("table.executor")    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-        $page->t("table.reason")      => $page->clean($row['reason']),
-        $page->t("table.date")        => $page->millis_to_date($row['time']),
-        $page->t("table.expires")     => $page->expiry($row),
-        $page->t("table.server.name") => $page->server($row),
+        "table.player"      => $page->get_avatar($player_name, $row['uuid']),
+        "table.executor"    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+        "table.reason"      => $page->clean($row['reason']),
+        "table.date"        => $page->millis_to_date($row['time']),
+        "table.expires"     => $page->expiry($row),
+        "table.server.name" => $page->server($row),
     ));
 }
 $page->table_end();
diff --git a/history.php b/history.php
index f55dec3..7c4710b 100644
--- a/history.php
+++ b/history.php
@@ -163,13 +163,13 @@ try {
             $label = "<span class='badge litebans-label-history litebans-label-$label_type'>$label_name</span>";
 
             $page->print_table_rows($row, array(
-                $page->t("generic.type")      => $label,
-                $page->t("table.player")      => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']),
-                $page->t("table.executor")    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-                $page->t("table.reason")      => $page->clean($row['reason']),
-                $page->t("table.date")        => $page->millis_to_date($row['time']),
-                $page->t("table.expires")     => $page->expiry($row),
-                $page->t("table.server.name") => $page->server($row),
+                "generic.type"      => $label,
+                "table.player"      => $page->get_avatar($page->get_name($row['uuid']), $row['uuid']),
+                "table.executor"    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+                "table.reason"      => $page->clean($row['reason']),
+                "table.date"        => $page->millis_to_date($row['time']),
+                "table.expires"     => $page->expiry($row),
+                "table.server.name" => $page->server($row),
                 //'i' => $i . "/" . $limit . "/" . $total,
             ));
         }
diff --git a/inc/page.php b/inc/page.php
index 188954f..0847a9e 100644
--- a/inc/page.php
+++ b/inc/page.php
@@ -59,6 +59,12 @@ class Page {
             'warn' => $this->t("page.expired.warning"),
             'kick' => null,
         );
+        $this->punished_by = array(
+            'ban'  => $this->t("generic.banned.by"),
+            'mute' => $this->t("generic.muted.by"),
+            'warn' => $this->t("generic.warned.by"),
+            'kick' => $this->t("generic.kicked.by"),
+        );
 
         if ($header) {
             $h = new Header($this);
@@ -393,16 +399,25 @@ class Page {
     }
 
     function print_table_rows($row, $array, $print_headers = true) {
+        $type = $this->type;
         if (!$this->settings->show_server_scope) {
-            unset($array[$this->t("table.server.name")]);
+            unset($array["table.server.name"]);
         }
         if ($print_headers && !$this->table_headers_printed) {
             $headers = array_keys($array);
-            $this->table_print_headers($headers);
+            $headers_translated = array();
+            foreach ($headers as $header) {
+                if ($header === "table.executor" && $this->name !== "history") {
+                    $header = $this->punished_by[$type];
+                } else {
+                    $header = $this->t($header);
+                }
+                array_push($headers_translated, $header);
+            }
+            $this->table_print_headers($headers_translated);
             $this->table_headers_printed = true;
         }
         $id = $row['id'];
-        $type = $this->type;
         echo "<tr>";
         foreach ($array as $header => $text) {
             $a = "a";
diff --git a/kicks.php b/kicks.php
index bcbb423..68bc3da 100644
--- a/kicks.php
+++ b/kicks.php
@@ -16,11 +16,11 @@ foreach ($rows as $row) {
     if ($player_name === null) continue;
 
     $page->print_table_rows($row, array(
-        $page->t("table.player")      => $page->get_avatar($player_name, $row['uuid']),
-        $page->t("table.executor")    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-        $page->t("table.reason")      => $page->clean($row['reason']),
-        $page->t("table.date")        => $page->millis_to_date($row['time']),
-        $page->t("table.server.name") => $page->server($row, "server_origin"),
+        "table.player"      => $page->get_avatar($player_name, $row['uuid']),
+        "table.executor"    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+        "table.reason"      => $page->clean($row['reason']),
+        "table.date"        => $page->millis_to_date($row['time']),
+        "table.server.name" => $page->server($row, "server_origin"),
     ));
 }
 $page->table_end();
diff --git a/lang/en_US.utf8.php b/lang/en_US.utf8.php
index 5090626..3ea119f 100644
--- a/lang/en_US.utf8.php
+++ b/lang/en_US.utf8.php
@@ -23,10 +23,21 @@ class DefaultLang {
 
         $array["generic.ban"] = "Ban";
         $array["generic.mute"] = "Mute";
-        $array["generic.ipban"] = "IP " . $array["generic.ban"];
-        $array["generic.ipmute"] = "IP " . $array["generic.mute"];
         $array["generic.warn"] = "Warning";
         $array["generic.kick"] = "Kick";
+
+        $array["generic.banned"] = "Banned";
+        $array["generic.muted"] = "Muted";
+        $array["generic.warned"] = "Warned";
+        $array["generic.kicked"] = "Kicked";
+
+        $array["generic.banned.by"] = $array["generic.banned"] . " By";
+        $array["generic.muted.by"] = $array["generic.muted"] . " By";
+        $array["generic.warned.by"] = $array["generic.warned"] . " By";
+        $array["generic.kicked.by"] = $array["generic.kicked"] . " By";
+
+        $array["generic.ipban"] = "IP " . $array["generic.ban"];
+        $array["generic.ipmute"] = "IP " . $array["generic.mute"];
         $array["generic.type"] = "Type";
         $array["generic.active"] = "Active";
         $array["generic.inactive"] = "Inactive";
diff --git a/mutes.php b/mutes.php
index d1aae65..8fa2b7b 100644
--- a/mutes.php
+++ b/mutes.php
@@ -16,12 +16,12 @@ foreach ($rows as $row) {
     if ($player_name === null) continue;
 
     $page->print_table_rows($row, array(
-        $page->t("table.player")      => $page->get_avatar($player_name, $row['uuid']),
-        $page->t("table.executor")    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-        $page->t("table.reason")      => $page->clean($row['reason']),
-        $page->t("table.date")        => $page->millis_to_date($row['time']),
-        $page->t("table.expires")     => $page->expiry($row),
-        $page->t("table.server.name") => $page->server($row),
+        "table.player"      => $page->get_avatar($player_name, $row['uuid']),
+        "table.executor"    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+        "table.reason"      => $page->clean($row['reason']),
+        "table.date"        => $page->millis_to_date($row['time']),
+        "table.expires"     => $page->expiry($row),
+        "table.server.name" => $page->server($row),
     ));
 }
 $page->table_end();
diff --git a/warnings.php b/warnings.php
index 5e5f432..ad409df 100644
--- a/warnings.php
+++ b/warnings.php
@@ -16,12 +16,12 @@ foreach ($rows as $row) {
     if ($player_name === null) continue;
 
     $page->print_table_rows($row, array(
-        $page->t("table.player")      => $page->get_avatar($player_name, $row['uuid']),
-        $page->t("table.executor")    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
-        $page->t("table.reason")      => $page->clean($row['reason']),
-        $page->t("table.expires")     => $page->expiry($row),
-        $page->t("warnings.received") => (($page->active($row, 'warned') === true) ? "1" : "0"),
-        $page->t("table.server.name") => $page->server($row),
+        "table.player"      => $page->get_avatar($player_name, $row['uuid']),
+        "table.executor"    => $page->get_avatar($page->get_banner_name($row), $row['banned_by_uuid']),
+        "table.reason"      => $page->clean($row['reason']),
+        "table.expires"     => $page->expiry($row),
+        "warnings.received" => (($page->active($row, 'warned') === true) ? "1" : "0"),
+        "table.server.name" => $page->server($row),
     ));
 }
 $page->table_end();