diff --git a/graphics/auto.png b/graphics/auto.png
new file mode 100644
index 0000000..9b816b7
Binary files /dev/null and b/graphics/auto.png differ
diff --git a/graphics/browse.png b/graphics/browse.png
new file mode 100644
index 0000000..e25ca33
Binary files /dev/null and b/graphics/browse.png differ
diff --git a/graphics/clear.png b/graphics/clear.png
new file mode 100644
index 0000000..a1c366f
Binary files /dev/null and b/graphics/clear.png differ
diff --git a/graphics/open.png b/graphics/open.png
new file mode 100644
index 0000000..c285161
Binary files /dev/null and b/graphics/open.png differ
diff --git a/graphics/parse.png b/graphics/parse.png
new file mode 100644
index 0000000..c6b2d7f
Binary files /dev/null and b/graphics/parse.png differ
diff --git a/graphics/save.png b/graphics/save.png
new file mode 100644
index 0000000..f730a76
Binary files /dev/null and b/graphics/save.png differ
diff --git a/graphics/search.png b/graphics/search.png
new file mode 100644
index 0000000..94eee8c
Binary files /dev/null and b/graphics/search.png differ
diff --git a/pagebrowser.py b/pagebrowser.py
index 2f0c861..c7f53c3 100644
--- a/pagebrowser.py
+++ b/pagebrowser.py
@@ -28,7 +28,7 @@ class PageBrowserWindow(QtGui.QDialog):
 	
 	
 	def __init__(self, parent):
-		super(PageBrowserWindow, self).__init__(None)
+		super(PageBrowserWindow, self).__init__(parent)
 		
 		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'pagebrowser.ui' ), self)
 		
diff --git a/taggerwindow.py b/taggerwindow.py
index a6f7bd2..5dca2ed 100644
--- a/taggerwindow.py
+++ b/taggerwindow.py
@@ -182,14 +182,21 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.actionParse_Filename.setStatusTip( 'Try to extract tags from filename' )
 		self.actionParse_Filename.triggered.connect( self.useFilename )
 
-		self.actionQuery_Online.setShortcut( 'Ctrl+W' )
-		self.actionQuery_Online.setStatusTip( 'Search online for tags' )
-		self.actionQuery_Online.triggered.connect( self.queryOnline )
+		self.actionSearchOnline.setShortcut( 'Ctrl+W' )
+		self.actionSearchOnline.setStatusTip( 'Search online for tags' )
+		self.actionSearchOnline.triggered.connect( self.queryOnline )
+
+		#self.actionAutoSearch.triggered.connect( self.autoSearch )
 		
 		#self.actionClearEntryForm.setShortcut( 'Ctrl+C' )
 		self.actionClearEntryForm.setStatusTip( 'Clear all the data on the screen' )
 		self.actionClearEntryForm.triggered.connect( self.clearForm )
 
+		# Window Menu
+		self.actionPageBrowser.setShortcut( 'Ctrl+P' )
+		self.actionPageBrowser.setStatusTip( 'Show the page browser' )
+		self.actionPageBrowser.triggered.connect( self.showPageBrowser )
+
 		# Help Menu
 		self.actionAbout.setShortcut( 'Ctrl+A' )
 		self.actionAbout.setStatusTip( 'Show the ' + self.appName + ' info' )
@@ -197,11 +204,21 @@ class TaggerWindow( QtGui.QMainWindow):
 	
 		# ToolBar
 	
+		self.actionLoad.setIcon( QtGui.QIcon('graphics/open.png') )
+		self.actionWrite_Tags.setIcon( QtGui.QIcon('graphics/save.png') )
+		self.actionParse_Filename.setIcon( QtGui.QIcon('graphics/parse.png') )
+		self.actionSearchOnline.setIcon( QtGui.QIcon('graphics/search.png') )
+		self.actionAutoSearch.setIcon( QtGui.QIcon('graphics/auto.png') )
+		self.actionClearEntryForm.setIcon( QtGui.QIcon('graphics/clear.png') )
+		self.actionPageBrowser.setIcon( QtGui.QIcon('graphics/browse.png') )
+		
 		self.toolBar.addAction( self.actionLoad )
 		self.toolBar.addAction( self.actionWrite_Tags )
 		self.toolBar.addAction( self.actionParse_Filename )
-		self.toolBar.addAction( self.actionQuery_Online )
+		self.toolBar.addAction( self.actionSearchOnline )
+		self.toolBar.addAction( self.actionAutoSearch )
 		self.toolBar.addAction( self.actionClearEntryForm )
+		self.toolBar.addAction( self.actionPageBrowser )
 		#self.toolBar.addAction( self.actionRemoveCBLTags )
 		#self.toolBar.addAction( self.actionRemoveCRTags )
         
diff --git a/taggerwindow.ui b/taggerwindow.ui
index 85b0373..eac4ab0 100644
--- a/taggerwindow.ui
+++ b/taggerwindow.ui
@@ -19,6 +19,9 @@
   <property name="windowTitle">
    <string>ComicTagger</string>
   </property>
+  <property name="unifiedTitleAndToolBarOnMac">
+   <bool>true</bool>
+  </property>
   <widget class="QWidget" name="centralWidget">
    <property name="sizePolicy">
     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -949,11 +952,19 @@
      <string>Tags</string>
     </property>
     <addaction name="actionParse_Filename"/>
-    <addaction name="actionQuery_Online"/>
+    <addaction name="actionSearchOnline"/>
+    <addaction name="actionAutoSearch"/>
     <addaction name="actionClearEntryForm"/>
    </widget>
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
+     <string>Window</string>
+    </property>
+    <addaction name="actionPageBrowser"/>
+   </widget>
    <addaction name="menuComicTagger"/>
    <addaction name="menuTags"/>
+   <addaction name="menuWindow"/>
    <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="toolBar">
@@ -963,6 +974,12 @@
    <property name="movable">
     <bool>false</bool>
    </property>
+   <property name="allowedAreas">
+    <set>Qt::NoToolBarArea</set>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonFollowStyle</enum>
+   </property>
    <property name="floatable">
     <bool>false</bool>
    </property>
@@ -1004,14 +1021,14 @@
     <string>Parse Filename</string>
    </property>
   </action>
-  <action name="actionQuery_Online">
+  <action name="actionSearchOnline">
    <property name="text">
-    <string>Query Online</string>
+    <string>Search Online</string>
    </property>
   </action>
   <action name="actionClearEntryForm">
    <property name="text">
-    <string>Clear Entry Form</string>
+    <string>Clear Form</string>
    </property>
   </action>
   <action name="actionRemoveCRTags">
@@ -1044,6 +1061,34 @@
     <string>Settings...</string>
    </property>
   </action>
+  <action name="actionAutoSearch">
+   <property name="text">
+    <string>Search and Auto-Select</string>
+   </property>
+   <property name="iconText">
+    <string>Auto-Select</string>
+   </property>
+   <property name="toolTip">
+    <string>Search online for tags and auto-select best match</string>
+   </property>
+   <property name="statusTip">
+    <string>Search online for tags and auto-select best match</string>
+   </property>
+  </action>
+  <action name="actionPageBrowser">
+   <property name="text">
+    <string>Show Page Browser</string>
+   </property>
+   <property name="iconText">
+    <string>Page Browser</string>
+   </property>
+   <property name="toolTip">
+    <string>Show the Page Browser to inspect the comic</string>
+   </property>
+   <property name="statusTip">
+    <string>Show the Page Browser to inspect the comic</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>