diff --git a/sys/windows/main.php b/sys/windows/main.php
index 212611a..b263bdc 100644
--- a/sys/windows/main.php
+++ b/sys/windows/main.php
@@ -150,7 +150,7 @@ class Main extends GtkWindow {
 
 		$scrolled_win = new GtkScrolledWindow();
     	$scrolled_win->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
-    	$scrolled_win->add(new DataGrid());
+    	//$scrolled_win->add(new DataGrid());
 
     	// Add the connection sidebar
     	$this->connection_sidebar =& Connection_Sidebar::get_instance();
diff --git a/sys/windows/widgets/connection_sidebar.php b/sys/windows/widgets/connection_sidebar.php
index 33bf5d9..cd43793 100644
--- a/sys/windows/widgets/connection_sidebar.php
+++ b/sys/windows/widgets/connection_sidebar.php
@@ -221,6 +221,12 @@ class Connection_Sidebar extends GtkVBox {
 
 		// Set up menu items
 		{
+			$edit = new GtkImageMenuItem('Edit Connection');
+			$edit->set_image(GtkImage::new_from_stock(GTK::STOCK_EDIT, GTK::ICON_SIZE_MENU));
+			$edit->connect_simple('activate', array($this, 'edit_connection'));
+
+			$this->menu->append($edit);
+
 			$remove = new GtkImageMenuItem('Delete Connection');
 			$remove->set_image(GtkImage::new_from_stock(GTK::STOCK_CANCEL, Gtk::ICON_SIZE_MENU));
 			$remove->connect_simple('activate', array($this, 'remove_connection'), $all);