diff --git a/ag/gm/include/npc.inc.php b/ag/gm/include/npc.inc.php
index e1b690f..9b2f75b 100644
--- a/ag/gm/include/npc.inc.php
+++ b/ag/gm/include/npc.inc.php
@@ -13,10 +13,10 @@ include_once(ROOT_PATH.'/include/attackenset.inc.php');
 include_once(ROOT_PATH.'/include/erstellfunctions.inc.php');
 include_once(ROOT_PATH.'/include/designfunctions.inc.php');
 
-defineIfNotDefined('ACTION_EDIT', 'edit');
-defineIfNotDefined('ACTION_CREATE', 'create');
-defineIfNotDefined('TASK_EDIT', 'dochange');
-defineIfNotDefined('TASK_CREATE', 'docreate');
+define('ACTION_EDIT', 'edit');
+define('ACTION_CREATE', 'create');
+define('TASK_EDIT', 'dochange');
+define('TASK_CREATE', 'docreate');
 defineIfNotDefined('NPC_USER_NAME', 'animegame-npc');
 
 function getDropItemsAsOptions(){
@@ -202,7 +202,6 @@ function displayNPCInfo($action, $task, $charid) {
 	echo "\t\t".'<tr><td>Anzahl</td><td style="text-align:center"><input name="data[drop_anzahl]" value="'.debbcode($row['wieviel']).'"></input></td></tr>'."\n";
 	echo "\t\t".'<tr><td>maximale Wiederholungen</td><td style="text-align:center"><input name="data[drop_max]" value="'.debbcode($row['mal']).'"></input></td></tr>'."\n";
 	echo "\t\t".'<tr><td>Preis</td><td style="text-align:center"><input name="data[preis]" value="'.debbcode($row['preis']).'"></input></td></tr>'."\n";
-
 	//attacken informationen
 	echo "\t".'<tr><td colspan="'.$colspan.'" style="text-align:center">Attacken bearbeiten</td></tr>'."\n";
 	for($i = 1;$i<11;$i++){
@@ -213,7 +212,6 @@ function displayNPCInfo($action, $task, $charid) {
 		}
 		echo '</select></td></tr>'."\n";
 	}
-
 	//menü
 	echo "\t".'<tr><td colspan="'.$colspan.'" style="text-align:center"><input type="submit" value="speichern"></td></tr>'."\n";
 	echo "\t".'<tr><td colspan="'.$colspan.'" style="text-align:center"><a href="'.$_SERVER['PHP_SELF'].'?choose=npc">NPC Übersicht</a></td></tr>'."\n";
@@ -364,7 +362,6 @@ function displayNPCOverview($page) {
 
 	$sql = 'SELECT '.join($d_array,',').' from chars where rasse = \'NPC\' ORDER BY level, Name LIMIT '.($page*20).', 20';
 	$qry = mysql_query($sql);
-	//$anzahlSeiten = ceil(mysql_num_rows(mysql_query($sql))/20);
 	$colspan = count($d_array);
 	echo "\t".'<tr><td colspan="'.$colspan.'"><h1 style="text-align:center">Übersicht</h1></td></tr>'."\n";;
 	echo "\t".'<tr>'."\n";
@@ -394,10 +391,10 @@ function displayNPCOverview($page) {
 	}
 	$total = mysql_num_rows(mysql_query('SELECT '.join($d_array,',').' from chars where rasse = \'NPC\''));
 	$url = '<a href="'.$_SERVER['PHP_SELF'].'?choose=npc&page=###PAGE###">###LABEL###</a>';
+	echo "\t".'<tr><td colspan="'.$colspan.'"><hr></td></tr>'."\n";
 	echo "\t".'<tr><td colspan="'.$colspan.'">'.displayPagelinksNew(20, $total, $page, $url).'</td></tr>'."\n";
-
+	echo "\t".'<tr><td colspan="'.$colspan.'"><hr></td></tr>'."\n";
 	echo "\t".'<tr><td colspan="'.$colspan.'" style="text-align:center"><a href="'.$_SERVER['PHP_SELF'].'?choose=npc&action=create">Create a new NPC</a></td></tr>'."\n";
-	echo "\t".'<tr><td colspan="'.$colspan.'" style="text-align:center"><hr></td></tr>'."\n";
 }
 
 function displayNPC($action, $task, $charid, $table, $page, $data, $att_ids){