diff --git a/db/smsmapper.php b/db/smsmapper.php
index 77391ad..ff14a1a 100644
--- a/db/smsmapper.php
+++ b/db/smsmapper.php
@@ -52,11 +52,10 @@ class SmsMapper extends Mapper {
 
 		$phoneList = array();
 		while($row = $result->fetchRow()) {
-			if (!in_array($row["sms_id"], $phoneList)) {
-				array_push($phoneList);
+			if (!in_array($row["sms_address"], $phoneList)) {
+				array_push($phoneList, $row["sms_address"]);
 			}
 		}
-		sort($phoneList);
 		return $phoneList;
 	}
 
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index b5a1363..f0262b0 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -1,19 +1,19 @@
 <ul>
 	<?php if (count($_["PNLConversations"]) > 0) { ?>
-	<li><a href="#">Conversations</a></li>
+	<li><a href="#">Conversations</a>
 	<ul>
 	<?php foreach ($_["PNLConversations"] as $number) { ?>
 		<li><?php p($number); ?></li>
 	<?php } ?>
-	</ul>
+	</ul></li>
 	<?php }	?>
 	
 	<?php if (count($_["PNLDrafts"]) > 0) { ?>
-	<li><a href="#">Drafts</a></li>
+	<li><a href="#">Drafts</a>
 	<ul>
 	<?php foreach ($_["PNLDrafts"] as $number) { ?>
 		<li><?php p($number); ?></li>
 	<?php } ?>
-	</ul>
+	</ul></li>
 	<?php }	?>
 </ul>