=== modified file 'ssherminatorlib/ssherminator.py'
--- ssherminatorlib/ssherminator.py	2009-01-04 20:24:47 +0000
+++ ssherminatorlib/ssherminator.py	2009-01-07 23:43:55 +0000
@@ -93,10 +93,10 @@
     self.inputbox.add(self.port_container)
     self.inputbox.add(self.opts_container)
     self.inputalign.add(self.inputbox)
-    self.box.add(self.inputalign)
+    self.box.pack_start(self.inputalign, False, True)
     
     # Now for the complicated Treeview stuff
-    self.box.add(gtk.Label()) # Is this an OK way to make some extra space?
+    self.box.pack_start(gtk.Label(), False, True) # Is this an OK way to make some extra space?
         
     self.treestore = gtk.TreeStore(str, object)
               
@@ -109,8 +109,10 @@
     for host in self.known_hosts.hosts:
       # Create an SSH connection object for this so we can use the same code
       # to load an OpenSSH host and an old connection from History
-      self.treestore.append(self.known_parent, [str(host), SSHConnection(host=host)])
-      
+      self.treestore.append(self.known_parent, [str(host).split(' ')[0], SSHConnection(host=host)])
+    
+    self.scrolledwindow = gtk.ScrolledWindow()
+    self.scrolledwindow.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
     self.treeview = gtk.TreeView(self.treestore)
     self.treeview.add_events(gtk.gdk.BUTTON_PRESS_MASK)
     self.treeview.connect('button_press_event', self.right_row_click)
@@ -124,11 +126,12 @@
     self.treeview.set_search_column(0)
     self.tvcolumn.set_sort_column_id(0)
     self.treeview.set_reorderable(True)
-    self.box.add(self.treeview)
+    self.scrolledwindow.add(self.treeview)
+    self.box.pack_start(self.scrolledwindow, True, True)
     
     # Stick it all in the window
-    self.box.add(gtk.Label())
-    self.box.add(self.buttonbox)
+    self.box.pack_start(gtk.Label(), False, True)
+    self.box.pack_start(self.buttonbox, False, True)
     self.window.add (self.box)
         
   def _get_username(self):
@@ -494,6 +497,7 @@
       self.hosts.append(line.split(",")[0])
       
     f.close()
+    self.hosts.sort()
 
     
 # This is lifted from Django: