diff --git a/system/pages/creatures.php b/system/pages/creatures.php
index c019fbe2..f87b6f28 100644
--- a/system/pages/creatures.php
+++ b/system/pages/creatures.php
@@ -10,9 +10,10 @@
  * @link      https://my-aac.org
  */
 defined('MYAAC') or die('Direct access not allowed!');
-$title = "Creatures";
+$title = 'Creatures';
 
-if (empty($_REQUEST['creature'])) {
+if (empty($_REQUEST['name'])) {
+	// display list of monsters
 	$preview = config('creatures_images_preview');
 	$creatures = $db->query('SELECT * FROM `' . TABLE_PREFIX . 'monsters` WHERE `hidden` != 1 '.(empty($_REQUEST['boss']) ? '': 'AND `rewardboss` = 1').' ORDER BY name asc')->fetchAll();
 
@@ -28,55 +29,55 @@ if (empty($_REQUEST['creature'])) {
 		'preview' => $preview
 	));
 
-} else {
-	$creature_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['creature']))));
-	$prep = $db->prepare('SELECT * FROM `' . TABLE_PREFIX . 'monsters` WHERE `hidden` != 1 AND `name` = ? LIMIT 1;');
-	$prep->execute([$creature_name]);
-	$creature = $prep->fetch();
+	return;
+}
 
-	if (isset($creature['name'])) {
-		function sort_by_chance($a, $b)
-		{
-			if ($a['chance'] == $b['chance']) {
-				return 0;
-			}
-			return ($a['chance'] > $b['chance']) ? -1 : 1;
+// display monster
+$creature_name = urldecode(stripslashes(ucwords(strtolower($_REQUEST['name']))));
+$prep = $db->prepare('SELECT * FROM `' . TABLE_PREFIX . 'monsters` WHERE `hidden` != 1 AND `name` = ? LIMIT 1;');
+$prep->execute([$creature_name]);
+$creature = $prep->fetch();
+
+if (isset($creature['name'])) {
+	function sort_by_chance($a, $b)
+	{
+		if ($a['chance'] == $b['chance']) {
+			return 0;
 		}
-
-		$title = $creature['name'] . " - Creatures";
-
-		$creature['img_link']= getCreatureImgPath($creature_name);
-
-		$voices = json_decode($creature['voices'], true);
-		$summons = json_decode($creature['summons'], true);
-		$elements = json_decode($creature['elements'], true);
-		$immunities = json_decode($creature['immunities'], true);
-		$loot = json_decode($creature['loot'], true);
-		usort($loot, 'sort_by_chance');
-
-		foreach ($loot as &$item) {
-			$item['name'] = getItemNameById($item['id']);
-			$item['rarity_chance'] = round($item['chance'] / 1000, 2);
-			$item['rarity'] = getItemRarity($item['chance']);
-			$item['tooltip'] = ucfirst($item['name']) . '<br/>Chance: ' . $item['rarity'] . (config('creatures_loot_percentage') ? ' ('. $item['rarity_chance'] .'%)' : '') . '<br/>Max count: ' . $item['count'];
-		}
-
-		$creature['loot'] = isset($loot) ? $loot : null;
-		$creature['voices'] = isset($voices) ? $voices : null;
-		$creature['summons'] = isset($summons) ? $summons : null;
-		$creature['elements'] = isset($elements) ? $elements : null;
-		$creature['immunities'] = isset($immunities) ? $immunities : null;
-
-		$twig->display('creature.html.twig', array(
-			'creature' => $creature,
-		));
-
-	} else {
-		echo "Creature with name <b>" . $creature_name . "</b> doesn't exist.";
+		return ($a['chance'] > $b['chance']) ? -1 : 1;
 	}
 
-//back button
-	$twig->display('creatures.back_button.html.twig');
-}
-?>
+	$title = $creature['name'] . " - Creatures";
 
+	$creature['img_link']= getCreatureImgPath($creature_name);
+
+	$voices = json_decode($creature['voices'], true);
+	$summons = json_decode($creature['summons'], true);
+	$elements = json_decode($creature['elements'], true);
+	$immunities = json_decode($creature['immunities'], true);
+	$loot = json_decode($creature['loot'], true);
+	usort($loot, 'sort_by_chance');
+
+	foreach ($loot as &$item) {
+		$item['name'] = getItemNameById($item['id']);
+		$item['rarity_chance'] = round($item['chance'] / 1000, 2);
+		$item['rarity'] = getItemRarity($item['chance']);
+		$item['tooltip'] = ucfirst($item['name']) . '<br/>Chance: ' . $item['rarity'] . (config('creatures_loot_percentage') ? ' ('. $item['rarity_chance'] .'%)' : '') . '<br/>Max count: ' . $item['count'];
+	}
+
+	$creature['loot'] = isset($loot) ? $loot : null;
+	$creature['voices'] = isset($voices) ? $voices : null;
+	$creature['summons'] = isset($summons) ? $summons : null;
+	$creature['elements'] = isset($elements) ? $elements : null;
+	$creature['immunities'] = isset($immunities) ? $immunities : null;
+
+	$twig->display('creature.html.twig', array(
+		'creature' => $creature,
+	));
+
+} else {
+	echo "Creature with name <b>" . $creature_name . "</b> doesn't exist.";
+}
+
+// back button
+$twig->display('creatures.back_button.html.twig');