Index: trunk/packages/sipb-xen-www/code/main.py
===================================================================
--- trunk/packages/sipb-xen-www/code/main.py	(revision 423)
+++ trunk/packages/sipb-xen-www/code/main.py	(revision 424)
@@ -211,4 +211,7 @@
                         cdrom='gutsy-i386')
     checkpoint.checkpoint('Got defaults')
+    def sortkey(machine):
+        return (machine.owner != user, machine.owner, machine.name)
+    machines = sorted(machines, key=sortkey)
     d = dict(user=user,
              cant_add_vm=validation.cantAddVm(user),
Index: trunk/packages/sipb-xen-www/code/templates/list.tmpl
===================================================================
--- trunk/packages/sipb-xen-www/code/templates/list.tmpl	(revision 423)
+++ trunk/packages/sipb-xen-www/code/templates/list.tmpl	(revision 424)
@@ -85,6 +85,4 @@
 #if $machine.uptime
 $machine.uptime#slurp
-#else
-Off#slurp
 #end if
 </td>
@@ -92,5 +90,5 @@
 #if $has_vnc[$machine] == True
 <a href="vnc?machine_id=$machine.machine_id">Console</a>#slurp
-#else
+#else if $has_vnc[$machine] != 'Off'
 $has_vnc[$machine]
 #end if
@@ -112,12 +110,13 @@
     <table>
       <tr>
-	<td>Name</td>
-	<td>Memory</td>
-	<td>Owner</td>
-        <td>Administrator</td>
-	<td>IP</td>
-	<td>Uptime</td>
-	<td>VNC</td>
-	<td></td>
+	<th>Name</th>
+	<th>Memory</th>
+	<th>Owner</th>
+        <th>Administrator</th>
+	<th>IP</th>
+	<th>Uptime</th>
+	<th>VNC</th>
+	<th></th>
+      </tr>
       #for $machine in $machines:
 	$machineRow($machine)