diff --git a/gui/manager.glade b/gui/manager.glade
index ba77ebc..7db266c 100644
--- a/gui/manager.glade
+++ b/gui/manager.glade
@@ -247,6 +247,7 @@
   </object>
   <object class="GtkWindow" id="ManagerWindow">
     <property name="can_focus">False</property>
+    <property name="border_width">2</property>
     <property name="title" translatable="yes">Package Manager</property>
     <property name="window_position">center</property>
     <property name="default_width">900</property>
@@ -520,7 +521,6 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="installed_column">
                             <property name="resizable">True</property>
-                            <property name="sizing">autosize</property>
                             <property name="title" translatable="yes">State</property>
                             <property name="clickable">True</property>
                             <property name="sort_indicator">True</property>
@@ -536,7 +536,6 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="name_column">
                             <property name="resizable">True</property>
-                            <property name="sizing">autosize</property>
                             <property name="title" translatable="yes">Name</property>
                             <property name="clickable">True</property>
                             <property name="sort_indicator">True</property>
@@ -554,7 +553,6 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="version_column">
                             <property name="resizable">True</property>
-                            <property name="sizing">autosize</property>
                             <property name="title" translatable="yes">Version</property>
                             <property name="clickable">True</property>
                             <property name="sort_indicator">True</property>
@@ -570,7 +568,6 @@
                         <child>
                           <object class="GtkTreeViewColumn" id="size_column">
                             <property name="resizable">True</property>
-                            <property name="sizing">autosize</property>
                             <property name="title" translatable="yes">Size</property>
                             <property name="clickable">True</property>
                             <property name="sort_indicator">True</property>
diff --git a/pamac-tray.py b/pamac-tray.py
index 141d656..aa2ef48 100755
--- a/pamac-tray.py
+++ b/pamac-tray.py
@@ -16,50 +16,50 @@ _ = gettext.gettext
 
 GObject.threads_init()
 
-icon = ''
-info = ''
 update_icon = 'software-update-available'
 update_info = _('{number} available updates')
 one_update_info = _('1 available update')
 noupdate_icon = ''
 noupdate_info = _('Your system is up-to-date')
+icon = noupdate_icon
+info = noupdate_info
 
 class Tray:
 	def __init__(self):
 		self.statusIcon = Gtk.StatusIcon()
 
-		#~ self.menu = Gtk.Menu()
-		#~ self.menuItem = Gtk.ImageMenuItem(_('Install/Check for updates'))
-		#~ self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-update', 16, 0)))
-		#~ self.menuItem.connect('activate', self.execute_update, self.statusIcon)
-		#~ self.menu.append(self.menuItem)
-		#~ self.menuItem = Gtk.ImageMenuItem(_('Manage packages'))
-		#~ self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-install', 16, 0)))
-		#~ self.menuItem.connect('activate', self.execute_manager, self.statusIcon)
-		#~ self.menu.append(self.menuItem)
-		#~ self.menuItem = Gtk.ImageMenuItem(_('Quit'))
-		#~ self.menuItem.set_image(Gtk.Image.new_from_stock('gtk-quit', Gtk.IconSize.MENU))
-		#~ self.menuItem.connect('activate', self.quit_tray, self.statusIcon)
-		#~ self.menu.append(self.menuItem)
+		self.menu = Gtk.Menu()
+		self.menuItem = Gtk.ImageMenuItem(_('Update Manager'))
+		self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-update', 16, 0)))
+		self.menuItem.connect('activate', self.execute_update, self.statusIcon)
+		self.menu.append(self.menuItem)
+		self.menuItem = Gtk.ImageMenuItem(_('Package Manager'))
+		self.menuItem.set_image(Gtk.Image.new_from_pixbuf(Gtk.IconTheme.get_default().load_icon('system-software-install', 16, 0)))
+		self.menuItem.connect('activate', self.execute_manager, self.statusIcon)
+		self.menu.append(self.menuItem)
+		self.menuItem = Gtk.ImageMenuItem(_('Quit'))
+		self.menuItem.set_image(Gtk.Image.new_from_stock('gtk-quit', Gtk.IconSize.MENU))
+		self.menuItem.connect('activate', self.quit_tray, self.statusIcon)
+		self.menu.append(self.menuItem)
 
-		#~ self.statusIcon.connect('popup-menu', self.popup_menu_cb, self.menu)
-		self.statusIcon.connect('activate', self.activate_cb)#, self.menu)
+		self.statusIcon.connect('popup-menu', self.popup_menu_cb, self.menu)
+		self.statusIcon.connect('activate', self.activate_cb)
 
-	#~ def execute_update(self, widget, event, data = None):
-		#~ Popen(['/usr/bin/pamac-updater'])
+	def execute_update(self, widget, event, data = None):
+		Popen(['/usr/bin/pamac-updater'])
 
-	#~ def execute_manager(self, widget, event, data = None):
-		#~ Popen(['/usr/bin/pamac-manager'])
+	def execute_manager(self, widget, event, data = None):
+		Popen(['/usr/bin/pamac-manager'])
 
-	#~ def quit_tray(self, widget, data = None):
-		#~ t.shutdown()
-		#~ Gtk.main_quit()
+	def quit_tray(self, widget, data = None):
+		t.shutdown()
+		Gtk.main_quit()
 
-	#~ def popup_menu_cb(self, widget, button, time, data = None):
-		#~ if button == 3:
-			#~ if data:
-				#~ data.show_all()
-				#~ data.popup(None, None, Gtk.StatusIcon.position_menu, self.statusIcon, 3, time)
+	def popup_menu_cb(self, widget, button, time, data = None):
+		if button == 3:
+			if data:
+				data.show_all()
+				data.popup(None, None, Gtk.StatusIcon.position_menu, self.statusIcon, 3, time)
 
 	def activate_cb(self, widget, data = None):
 		if icon == update_icon: