diff --git a/ext/alias_editor/main.php b/ext/alias_editor/main.php
index 7e4c1138..4bdbbc70 100644
--- a/ext/alias_editor/main.php
+++ b/ext/alias_editor/main.php
@@ -40,7 +40,9 @@ class AliasEditor extends Extension {
 			}
 			else if($event->get_arg(0) == "list") {
 				global $database;
-				$this->theme->display_aliases($event->page, $database->db->GetAssoc("SELECT oldtag, newtag FROM aliases"), $event->user->is_admin());
+				$this->theme->display_aliases($event->page, 
+						$database->db->GetAssoc("SELECT oldtag, newtag FROM aliases ORDER BY newtag"),
+						$event->user->is_admin());
 			}
 			else if($event->get_arg(0) == "export") {
 				global $database;
@@ -71,7 +73,8 @@ class AliasEditor extends Extension {
 
 		if(is_a($event, 'AddAliasEvent')) {
 			global $database;
-			$database->Execute("INSERT INTO aliases(oldtag, newtag) VALUES(?, ?)", array($event->oldtag, $event->newtag));
+			$database->Execute("INSERT INTO aliases(oldtag, newtag) VALUES(?, ?)",
+					array($event->oldtag, $event->newtag));
 		}
 		
 		if(is_a($event, 'UserBlockBuildingEvent')) {
diff --git a/ext/alias_editor/theme.php b/ext/alias_editor/theme.php
index cfe24c0a..82d6513e 100644
--- a/ext/alias_editor/theme.php
+++ b/ext/alias_editor/theme.php
@@ -45,6 +45,7 @@ class AliasEditorTheme extends Themelet {
 		$html = "
 			<table border='1'>
 				<thead><td>From</td><td>To</td>$action</thead>
+				$add
 				$h_aliases
 				$add
 			</table>