diff --git a/pgadmin/frm/frmOptions.cpp b/pgadmin/frm/frmOptions.cpp
index 92f9b75..35d1218 100644
--- a/pgadmin/frm/frmOptions.cpp
+++ b/pgadmin/frm/frmOptions.cpp
@@ -20,6 +20,7 @@
 #include <wx/clrpicker.h>
 #include <wx/filepicker.h>
 #include <wx/fontpicker.h>
+#include <wx/treectrl.h>
 
 // App headers
 #include "frm/frmOptions.h"
@@ -36,6 +37,28 @@
 
 #include "images/properties.pngc"
 
+#define GENERAL_ITEM _("General")
+#define GENERAL_HELPPATH_ITEM _("Help paths")
+#define GENERAL_BINPATH_ITEM _("Binaries paths")
+#define GENERAL_MISC_ITEM _("Miscellaneous")
+#define BROWSER_ITEM _("Browser")
+#define BROWSER_DISPLAY_ITEM _("Display")
+#define BROWSER_PROPERTIES_ITEM _("Properties")
+#define BROWSER_MISC_ITEM _("Miscellaneous")
+#define QUERYTOOL_ITEM _("Query tool")
+#define QUERYTOOL_EDITOR_ITEM _("Query editor")
+#define QUERYTOOL_COLOURS_ITEM _("Colours")
+#define QUERYTOOL_RESULTS_ITEM _("Results grid")
+#define QUERYTOOL_FILES_ITEM _("Query file")
+#define QUERYTOOL_FAVOURITES_ITEM _("Favourites")
+#define QUERYTOOL_MACROS_ITEM _("Macros")
+#define QUERYTOOL_HISTORYFILE_ITEM _("History file")
+#define SERVERSTATUS_ITEM _("Server status")
+#define PGAGENT_ITEM _("pgAgent")
+#define MISC_ITEM _("Miscellaneous")
+#define MISC_GURUHINTS_ITEM _("Guru hints")
+#define MISC_LOGGING_ITEM _("Logging")
+
 #define nbOptions                   CTRL_NOTEBOOK("nbOptions")
 #define txtPgHelpPath               CTRL_TEXT("txtPgHelpPath")
 #define txtEdbHelpPath              CTRL_TEXT("txtEdbHelpPath")
@@ -99,8 +122,27 @@
 #define pickerSQLColour7            CTRL_COLOURPICKER("pickerSQLColour7")
 #define pickerSQLColour10           CTRL_COLOURPICKER("pickerSQLColour10")
 #define pickerSQLColour11           CTRL_COLOURPICKER("pickerSQLColour11")
-#define pickerSQLCaretColour               CTRL_COLOURPICKER("pickerSQLCaretColour")
+#define pickerSQLCaretColour        CTRL_COLOURPICKER("pickerSQLCaretColour")
 #define chkKeywordsInUppercase      CTRL_CHECKBOX("chkKeywordsInUppercase")
+#define menus                		CTRL_TREE("menus")
+#define pnlGeneralHelpPath          CTRL_PANEL("pnlGeneralHelpPath")
+#define pnlGeneralBinPath         	CTRL_PANEL("pnlGeneralBinPath")
+#define pnlGeneralMisc          	CTRL_PANEL("pnlGeneralMisc")
+#define pnlBrowserDisplay           CTRL_PANEL("pnlBrowserDisplay")
+#define pnlBrowserProperties        CTRL_PANEL("pnlBrowserProperties")
+#define pnlBrowserMisc          	CTRL_PANEL("pnlBrowserMisc")
+#define pnlQueryToolEditor          CTRL_PANEL("pnlQueryToolEditor")
+#define pnlQueryToolColours         CTRL_PANEL("pnlQueryToolColours")
+#define pnlQueryToolResults         CTRL_PANEL("pnlQueryToolResults")
+#define pnlQueryToolFiles          	CTRL_PANEL("pnlQueryToolFiles")
+#define pnlQueryToolFavourites      CTRL_PANEL("pnlQueryToolFavourites")
+#define pnlQueryToolMacros          CTRL_PANEL("pnlQueryToolMacros")
+#define pnlQueryToolHistoryFile     CTRL_PANEL("pnlQueryToolHistoryFile")
+#define pnlServerStatus          	CTRL_PANEL("pnlServerStatus")
+#define pnlPgAgent          		CTRL_PANEL("pnlPgAgent")
+#define pnlMiscGuruHints          	CTRL_PANEL("pnlMiscGuruHints")
+#define pnlMiscLogging          	CTRL_PANEL("pnlMiscLogging")
+
 
 BEGIN_EVENT_TABLE(frmOptions, pgDialog)
 	EVT_MENU(MNU_HELP,                                            frmOptions::OnHelp)
@@ -113,6 +155,7 @@ BEGIN_EVENT_TABLE(frmOptions, pgDialog)
 	EVT_BUTTON (wxID_HELP,                                        frmOptions::OnHelp)
 	EVT_BUTTON (wxID_CANCEL,                                      frmOptions::OnCancel)
 	EVT_COMBOBOX(XRCID("cbCopyQuote"),		                      frmOptions::OnChangeCopyQuote)
+	EVT_TREE_SEL_CHANGED(XRCID("menus"),                          frmOptions::OnTreeSelChanged)
 END_EVENT_TABLE()
 
 
@@ -208,13 +251,15 @@ int wxRichTextFontDialog::ShowModal()
 
 frmOptions::frmOptions(frmMain *parent)
 {
+	wxTreeItemId root, node;
+
 	mainForm = parent;
 	wxWindowBase::SetFont(settings->GetSystemFont());
 	LoadResource(parent, wxT("frmOptions"));
 
 	// Icon
 	SetIcon(*properties_png_ico);
-	RestorePosition();
+	//RestorePosition();
 
 	wxAcceleratorEntry entries[1];
 
@@ -368,6 +413,58 @@ frmOptions::frmOptions(frmMain *parent)
 
 	wxCommandEvent e;
 	OnChangeCopyQuote(e);
+
+	// Fill the treeview
+	root = menus->AddRoot(_("Options"));
+	
+	node = menus->AppendItem(root, GENERAL_ITEM);
+	menus->AppendItem(node, GENERAL_HELPPATH_ITEM);
+	menus->AppendItem(node, GENERAL_BINPATH_ITEM);
+	menus->AppendItem(node, GENERAL_MISC_ITEM);
+	
+	node = menus->AppendItem(root, BROWSER_ITEM);
+	menus->AppendItem(node, BROWSER_DISPLAY_ITEM);
+	menus->AppendItem(node, BROWSER_PROPERTIES_ITEM);
+	menus->AppendItem(node, BROWSER_MISC_ITEM);
+	
+	node = menus->AppendItem(root, QUERYTOOL_ITEM);
+	menus->AppendItem(node, QUERYTOOL_EDITOR_ITEM);
+	menus->AppendItem(node, QUERYTOOL_COLOURS_ITEM);
+	menus->AppendItem(node, QUERYTOOL_RESULTS_ITEM);
+	menus->AppendItem(node, QUERYTOOL_FILES_ITEM);
+	menus->AppendItem(node, QUERYTOOL_FAVOURITES_ITEM);
+	menus->AppendItem(node, QUERYTOOL_MACROS_ITEM);
+	menus->AppendItem(node, QUERYTOOL_HISTORYFILE_ITEM);
+	
+	node = menus->AppendItem(root, SERVERSTATUS_ITEM);
+	
+	node = menus->AppendItem(root, PGAGENT_ITEM);
+	
+	node = menus->AppendItem(root, MISC_ITEM);
+	menus->AppendItem(node, MISC_GURUHINTS_ITEM);
+	menus->AppendItem(node, MISC_LOGGING_ITEM);
+	
+	menus->ExpandAllChildren(root);
+
+	pnlGeneralHelpPath->Show(false);
+	pnlGeneralBinPath->Show(false);
+	pnlGeneralMisc->Show(false);
+	pnlBrowserDisplay->Show(false);
+	pnlBrowserProperties->Show(false);
+	pnlBrowserMisc->Show(false);
+	pnlQueryToolEditor->Show(false);
+	pnlQueryToolColours->Show(false);
+	pnlQueryToolResults->Show(false);
+	pnlQueryToolFiles->Show(false);
+	pnlQueryToolFavourites->Show(false);
+	pnlQueryToolMacros->Show(false);
+	pnlQueryToolHistoryFile->Show(false);
+	pnlServerStatus->Show(false);
+	pnlPgAgent->Show(false);
+	pnlMiscGuruHints->Show(false);
+	pnlMiscLogging->Show(false);
+
+	pnlGeneralHelpPath->GetParent()->Layout();
 }
 
 
@@ -817,3 +914,69 @@ wxString frmOptions::CheckColour(wxString oldColour)
 	return newColour;
 }
 
+void frmOptions::OnTreeSelChanged(wxTreeEvent &event)
+{
+	wxTreeItemId sel = event.GetItem();
+	
+	if (sel)
+	{
+		// Hide everything
+		pnlGeneralHelpPath->Show(false);
+		pnlGeneralBinPath->Show(false);
+		pnlGeneralMisc->Show(false);
+		pnlBrowserDisplay->Show(false);
+		pnlBrowserProperties->Show(false);
+		pnlBrowserMisc->Show(false);
+		pnlQueryToolEditor->Show(false);
+		pnlQueryToolColours->Show(false);
+		pnlQueryToolResults->Show(false);
+		pnlQueryToolFiles->Show(false);
+		pnlQueryToolFavourites->Show(false);
+		pnlQueryToolMacros->Show(false);
+		pnlQueryToolHistoryFile->Show(false);
+		pnlServerStatus->Show(false);
+		pnlPgAgent->Show(false);
+		pnlMiscGuruHints->Show(false);
+		pnlMiscLogging->Show(false);
+
+		// Find the one to show
+		if (menus->GetItemText(sel) == GENERAL_HELPPATH_ITEM)
+			pnlGeneralHelpPath->Show(true);
+		else if (menus->GetItemText(sel) == GENERAL_BINPATH_ITEM)
+			pnlGeneralBinPath->Show(true);
+		else if (menus->GetItemText(sel) == GENERAL_MISC_ITEM)
+			pnlGeneralMisc->Show(true);
+		else if (menus->GetItemText(sel) == BROWSER_DISPLAY_ITEM)
+			pnlBrowserDisplay->Show(true);
+		else if (menus->GetItemText(sel) == BROWSER_PROPERTIES_ITEM)
+			pnlBrowserProperties->Show(true);
+		else if (menus->GetItemText(sel) == BROWSER_MISC_ITEM)
+			pnlBrowserMisc->Show(true);
+		else if (menus->GetItemText(sel) == QUERYTOOL_EDITOR_ITEM)
+			pnlQueryToolEditor->Show(true);
+		else if (menus->GetItemText(sel) == QUERYTOOL_COLOURS_ITEM)
+			pnlQueryToolColours->Show(true);
+		else if (menus->GetItemText(sel) == QUERYTOOL_RESULTS_ITEM)
+			pnlQueryToolResults->Show(true);
+		else if (menus->GetItemText(sel) == QUERYTOOL_FILES_ITEM)
+			pnlQueryToolFiles->Show(true);
+		else if (menus->GetItemText(sel) == QUERYTOOL_FAVOURITES_ITEM)
+			pnlQueryToolFavourites->Show(true);
+		else if (menus->GetItemText(sel) == QUERYTOOL_MACROS_ITEM)
+			pnlQueryToolMacros->Show(true);
+		else if (menus->GetItemText(sel) == QUERYTOOL_HISTORYFILE_ITEM)
+			pnlQueryToolHistoryFile->Show(true);
+		else if (menus->GetItemText(sel) == SERVERSTATUS_ITEM)
+			pnlServerStatus->Show(true);
+		else if (menus->GetItemText(sel) == PGAGENT_ITEM)
+			pnlPgAgent->Show(true);
+		else if (menus->GetItemText(sel) == MISC_GURUHINTS_ITEM)
+			pnlMiscGuruHints->Show(true);
+		else if (menus->GetItemText(sel) == MISC_LOGGING_ITEM)
+			pnlMiscLogging->Show(true);
+
+		pnlGeneralHelpPath->GetParent()->Layout();
+		// we don't need to call GetParent()->Layout() for all panels
+		// because they all share the same parent
+	}
+}
diff --git a/pgadmin/include/frm/frmOptions.h b/pgadmin/include/frm/frmOptions.h
index 534a593..5c0fcf4 100644
--- a/pgadmin/include/frm/frmOptions.h
+++ b/pgadmin/include/frm/frmOptions.h
@@ -41,6 +41,7 @@ private:
 	void OnResetHints(wxCommandEvent &ev);
 	void OnChangeCopyQuote(wxCommandEvent &ev);
 	void OnChangeSQLUseCustomColour(wxCommandEvent &ev);
+	void OnTreeSelChanged(wxTreeEvent &event);
 	wxString CheckColour(wxString colour);
 	void UpdateColourControls();
 	DECLARE_EVENT_TABLE()
diff --git a/pgadmin/ui/frmOptions.xrc b/pgadmin/ui/frmOptions.xrc
index 78f2430..25393b5 100644
--- a/pgadmin/ui/frmOptions.xrc
+++ b/pgadmin/ui/frmOptions.xrc
@@ -2,41 +2,41 @@
 <resource>
   <object class="wxDialog" name="frmOptions">
     <title>Options</title>
-    <size>350,310d</size>
+    <size>480,210d</size>
     <style>wxDEFAULT_DIALOG_STYLE|wxCAPTION|wxSYSTEM_MENU|wxRESIZE_BORDER</style>
     <object class="wxFlexGridSizer">
       <cols>1</cols>
       <growablerows>0</growablerows>
       <growablecols>0</growablecols>
       <object class="sizeritem">
-        <object class="wxNotebook" name="nbOptions">
-          <size>346,285d</size>
-          <object class="notebookpage">
-            <label>General</label>
-            <selected>1</selected>
-            <object class="wxPanel" name="pnlGeneral">
-              <object class="wxFlexGridSizer">
-                <cols>2</cols>
-                <rows>12</rows>
-                <vgap>5</vgap>
-                <hgap>5</hgap>
-                <growablecols>1</growablecols>
-                <growablerows>11</growablerows>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stLanguage">
-                    <label>User language</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxComboBox" name="cbLanguage">
-                    <content/>
-                    <style>wxCB_READONLY|wxCB_DROPDOWN</style>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
+        <object class="wxFlexGridSizer">
+          <cols>2</cols>
+          <growablerows>0</growablerows>
+          <growablecols>1</growablecols>
+          <object class="sizeritem">
+		    <object class="ctlTree" name="menus">
+			  <size>100,185d</size>
+              <style>wxTR_HAS_BUTTONS|wxSIMPLE_BORDER|wxTR_HIDE_ROOT</style>
+            </object>
+            <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+            <border>3</border>
+          </object>
+          <object class="sizeritem">
+		    <object class="wxFlexGridSizer">
+              <cols>1</cols>
+              <rows>2</rows>
+              <vgap>5</vgap>
+              <hgap>5</hgap>
+              <growablerows>0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15</growablerows>
+              <growablecols>0</growablecols>
+              <object class="sizeritem">
+			  <object class="wxPanel" name="pnlGeneralHelpPath">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stPgHelpPath">
                     <label>PG help path</label>
@@ -87,18 +87,19 @@
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stSystemSchemas">
-                    <label>System schemas</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="txtSystemSchemas"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
                 </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlGeneralBinPath">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stSlonyPath">
                     <label>Slony-I path</label>
@@ -159,150 +160,178 @@
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlGeneralMisc">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
                 <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label></label>
+                  <object class="wxStaticText" name="stLanguage">
+                    <label>User language</label>
                   </object>
                   <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkIgnoreVersion">
-                    <label>Ignore server/utility version mismatches</label>
+                  <object class="wxComboBox" name="cbLanguage">
+                    <content/>
+                    <style>wxCB_READONLY|wxCB_DROPDOWN</style>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label></label>
+                  <object class="wxStaticText" name="stSystemSchemas">
+                    <label>System schemas</label>
                   </object>
                   <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="stVersionMismatchWarning">
-                    <label>Warning: Backup or restore operations may fail if the PostgreSQL utilities do not match the server version.</label>
-                  </object>
+                  <object class="wxTextCtrl" name="txtSystemSchemas"/>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
-              </object>
-            </object>
-          </object>
-          <object class="notebookpage">
-            <label>Preferences</label>
-            <object class="wxPanel" name="pnlPreferences">
-              <object class="wxFlexGridSizer">
-                <cols>1</cols>
-                <vgap>5</vgap>
-                <hgap>5</hgap>
-                <growablecols>0</growablecols>
                 <object class="sizeritem">
-                  <object class="wxFlexGridSizer">
-                    <cols>2</cols>
-                    <rows>1</rows>
-                    <vgap>5</vgap>
-                    <hgap>5</hgap>
-                    <growablecols>1</growablecols>
-                    <object class="sizeritem">
-                      <object class="wxStaticText" name="stFont">
-                        <label>Font</label>
-                      </object>
-                      <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                      <border>4</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxFontPickerCtrl" name="pickerFont"/>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                      <border>4</border>
-                    </object>
+                  <object class="wxStaticText">
+                    <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkUnicodeFile">
-                    <label>Read and write Unicode UTF-8 files</label>
+                  <object class="wxCheckBox" name="chkIgnoreVersion">
+                    <label>Ignore server/utility version mismatches</label>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkWriteBOM">
-                    <label>Write BOM for UTF files</label>
-                    <checked>1</checked>
+                  <object class="wxStaticText">
+                    <label></label>
                   </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkAskSaveConfirm">
-                    <label>Do not prompt for unsaved files on exit</label>
-                    <checked>0</checked>
+                  <object class="wxStaticText" name="stVersionMismatchWarning">
+                    <label>Warning: Backup or restore operations may fail if the PostgreSQL utilities do not match the server version.</label>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlBrowserDisplay">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>1</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablerows>1</growablerows>
+                  <growablecols>0</growablecols>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkAskDelete">
-                    <label>Confirm object deletion</label>
-                    <checked>1</checked>
+                  <object class="wxStaticText" name="stDatabaseObjects">
+                    <label>Display the following database objects:</label>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkShowUsersForPrivileges">
-                    <label>Show users for privileges</label>
-                    <checked>0</checked>
+                  <object class="wxCheckListBox" name="lstDisplay">
+                    <content/>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkDoubleClickProperties">
-                    <label>Show object properties on double click in treeview</label>
-                    <checked>0</checked>
+                  <object class="wxButton" name="btnDefault">
+                    <label>&amp;Default</label>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlBrowserProperties">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkShowNotices">
-                    <label>Show NOTICEs</label>
-                    <checked>0</checked>
+                  <object class="wxStaticText" name="stAutoRowCount">
+                    <label>Count rows if estimated less than</label>
                   </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="txtAutoRowCount"/>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlBrowserMisc">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>1</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>0</growablecols>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkSuppressHints">
-                    <label>Do not show guru hints; I'm one myself</label>
+                  <object class="wxFlexGridSizer">
+                    <cols>2</cols>
+                    <rows>1</rows>
+                    <vgap>5</vgap>
+                    <hgap>5</hgap>
+                    <growablecols>1</growablecols>
+                    <object class="sizeritem">
+                      <object class="wxStaticText" name="stFont">
+                        <label>Font</label>
+                      </object>
+                      <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <border>4</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxFontPickerCtrl" name="pickerFont"/>
+                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                      <border>4</border>
+                    </object>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkResetHints">
-                    <label>Reset guru hints</label>
+                  <object class="wxCheckBox" name="chkAskDelete">
+                    <label>Confirm object deletion</label>
+                    <checked>1</checked>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
-              </object>
-            </object>
-          </object>
-          <object class="notebookpage">
-            <label>Browser</label>
-            <object class="wxPanel" name="pnlBrowser">
-              <object class="wxFlexGridSizer">
-                <cols>1</cols>
-                <rows>4</rows>
-                <vgap>5</vgap>
-                <hgap>5</hgap>
-                <growablecols>0</growablecols>
-                <growablerows>2</growablerows>
                 <object class="sizeritem">
                   <object class="wxCheckBox" name="chkSystemObjects">
                     <label>Show System Objects in the treeview</label>
@@ -312,37 +341,42 @@
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="stDatabaseObjects">
-                    <label>Display the following database objects:</label>
+                  <object class="wxCheckBox" name="chkShowUsersForPrivileges">
+                    <label>Show users for privileges</label>
+                    <checked>0</checked>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxCheckListBox" name="lstDisplay">
-                    <content/>
+                  <object class="wxCheckBox" name="chkDoubleClickProperties">
+                    <label>Show object properties on double click in treeview</label>
+                    <checked>0</checked>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxButton" name="btnDefault">
-                    <label>&amp;Default</label>
+                  <object class="wxCheckBox" name="chkShowNotices">
+                    <label>Show NOTICEs</label>
+                    <checked>0</checked>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                </object>
               </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
             </object>
-          </object>
-          <object class="notebookpage">
-            <label>Query Tool</label>
-            <object class="wxPanel" name="pnlQuery">
-              <object class="wxFlexGridSizer">
-                <cols>2</cols>
-                <vgap>5</vgap>
-                <hgap>5</hgap>
-                <growablecols>1</growablecols>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlQueryToolEditor">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="stSqlFont">
                     <label>Font</label>
@@ -356,21 +390,6 @@
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="lblMaxRows">
-                    <label>Maximum rows to retrieve</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="txtMaxRows">
-                    <value>100</value>
-                    <tooltip>Maximums rows to retrieve into output window; 0 = unlimited</tooltip>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
                   <object class="wxStaticText" name="lblMaxColSize">
                     <label>Max. characters per column</label>
                   </object>
@@ -385,18 +404,6 @@
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="stAutoRowCount">
-                    <label>Count rows if estimated less than</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="txtAutoRowCount"/>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
                   <object class="wxStaticText" name="stIndent">
                     <label>Indent characters</label>
                   </object>
@@ -424,199 +431,48 @@
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="stCopyQuote">
-                    <label>Result copy quoting</label>
+                  <object class="wxStaticText" name="stStickySql">
+                    <label>Copy SQL from main window to query tool</label>
                   </object>
                   <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxComboBox" name="cbCopyQuote">
-                    <content>
-                      <item>None</item>
-                      <item>Strings</item>
-                      <item>All</item>
-                    </content>
-                    <style>wxCB_READONLY|wxCB_DROPDOWN</style>
+                  <object class="wxCheckBox" name="chkStickySql">
+                    <label></label>
+                    <checked>1</checked>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxStaticText" name="stCopyQuoteChar">
-                    <label>Result copy quote character</label>
+                  <object class="wxStaticText" name="stAutoRollback">
+                    <label>Enable Auto ROLLBACK</label>
                   </object>
                   <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
                 <object class="sizeritem">
-                  <object class="wxComboBox" name="cbCopyQuoteChar">
-                    <content>
-                      <item>&quot;</item>
-                      <item>'</item>
-                    </content>
-                    <style>wxCB_DROPDOWN</style>
+                  <object class="wxCheckBox" name="chkAutoRollback">
+                    <label></label>
+                    <checked>0</checked>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stCopySeparator">
-                    <label>Result copy field separator</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxComboBox" name="cbCopySeparator">
-                    <content>
-                      <item>;</item>
-                      <item>,</item>
-                      <item>|</item>
-                      <item>Tab</item>
-                    </content>
-                    <style>wxCB_DROPDOWN</style>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
                 </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stStickySql">
-                    <label>Copy SQL from main window to query tool</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkStickySql">
-                    <label></label>
-                    <checked>1</checked>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stIndicateNull">
-                    <label>Show NULL values as &lt;NULL&gt;</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkIndicateNull">
-                    <label></label>
-                    <checked>0</checked>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stAutoRollback">
-                    <label>Enable Auto ROLLBACK</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxCheckBox" name="chkAutoRollback">
-                    <label></label>
-                    <checked>0</checked>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-              </object>
-            </object>
-          </object>
-          <object class="notebookpage">
-            <label>Query Tool files</label>
-            <object class="wxPanel" name="pnlQueryFiles">
-              <object class="wxFlexGridSizer">
-                <cols>2</cols>
-                <vgap>5</vgap>
-                <hgap>5</hgap>
-                <growablecols>1</growablecols>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stFavouritesFile">
-                    <label>Favourites file path</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxFilePickerCtrl" name="pickerFavouritesFile">
-                    <message>Select file to store favourites queries</message>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stMacrosFile">
-                    <label>Macros file path</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxFilePickerCtrl" name="pickerMacrosFile">
-                    <message>Select file to store macros</message>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="stHistoryFile">
-                    <label>History file path</label>
-                  </object>
-                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxFilePickerCtrl" name="pickerHistoryFile">
-                    <message>Select file to store queries history</message>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="lblHistoryMaxQueries">
-                    <label>Maximum queries to store in history</label>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="txtHistoryMaxQueries">
-                    <value>10</value>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText" name="lblHistoryMaxQuerySize">
-                    <label>Maximum size of a stored query (in bytes)</label>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="txtHistoryMaxQuerySize">
-                    <value>100</value>
-                  </object>
-                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                  <border>4</border>
-                </object>
-              </object>
-            </object>
-          </object>
-          <object class="notebookpage">
-            <label>Colours</label>
-            <object class="wxPanel" name="pnlColours">
-              <object class="wxFlexGridSizer">
-                <cols>1</cols>
-                <vgap>4</vgap>
-                <hgap>4</hgap>
-                <growablecols>0</growablecols>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlQueryToolColours">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>1</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>0</growablecols>
                 <object class="sizeritem">
                   <object class="wxStaticBoxSizer">
                     <label>Foreground/Background</label>
@@ -881,93 +737,376 @@
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlQueryToolResults">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
                 <object class="sizeritem">
-                  <object class="wxStaticBoxSizer">
-                    <label>Status Window</label>
-                    <orient>wxVERTICAL</orient>
-                    <object class="sizeritem">
-                      <object class="wxFlexGridSizer">
-                        <cols>4</cols>
-                        <rows>2</rows>
-                        <vgap>4</vgap>
-                        <hgap>4</hgap>
-                        <growablecols>0,2</growablecols>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="stIdleProcessColour">
-                            <label>Idle Process Colour</label>
-                          </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="ctlColourPicker" name="pickerIdleProcessColour">
-                            <size>70,12d</size>
-                          </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="stActiveProcessColour">
-                            <label>Active Process Colour</label>
-                          </object>
-                          <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="ctlColourPicker" name="pickerActiveProcessColour">
-                            <size>70,12d</size>
-                          </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="stSlowProcessColour">
-                            <label>Slow Process Colour</label>
-                          </object>
-                          <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="ctlColourPicker" name="pickerSlowProcessColour">
-                            <size>70,12d</size>
-                          </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText" name="stBlockedProcessColour">
-                            <label>Blocked Process Colour</label>
-                          </object>
-                          <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="ctlColourPicker" name="pickerBlockedProcessColour">
-                            <size>70,12d</size>
-                          </object>
-                          <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                          <border>4</border>
-                        </object>
-                      </object>
-                      <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
-                      <border>4</border>
-                    </object>
+                  <object class="wxStaticText" name="stCopyQuote">
+                    <label>Result copy quoting</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxComboBox" name="cbCopyQuote">
+                    <content>
+                      <item>None</item>
+                      <item>Strings</item>
+                      <item>All</item>
+                    </content>
+                    <style>wxCB_READONLY|wxCB_DROPDOWN</style>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="stCopyQuoteChar">
+                    <label>Result copy quote character</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxComboBox" name="cbCopyQuoteChar">
+                    <content>
+                      <item>&quot;</item>
+                      <item>'</item>
+                    </content>
+                    <style>wxCB_DROPDOWN</style>
                   </object>
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="stCopySeparator">
+                    <label>Result copy field separator</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxComboBox" name="cbCopySeparator">
+                    <content>
+                      <item>;</item>
+                      <item>,</item>
+                      <item>|</item>
+                      <item>Tab</item>
+                    </content>
+                    <style>wxCB_DROPDOWN</style>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="stIndicateNull">
+                    <label>Show NULL values as &lt;NULL&gt;</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxCheckBox" name="chkIndicateNull">
+                    <label></label>
+                    <checked>0</checked>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                </object>
               </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
             </object>
-          </object>
-          <object class="notebookpage">
-            <label>Logging</label>
-            <object class="wxPanel" name="pnlLogging">
-              <object class="wxFlexGridSizer">
-                <cols>1</cols>
-                <rows>3</rows>
-                <vgap>5</vgap>
-                <hgap>5</hgap>
-                <growablecols>0</growablecols>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlQueryToolFiles">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>1</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>0</growablecols>
+                <object class="sizeritem">
+                  <object class="wxCheckBox" name="chkUnicodeFile">
+                    <label>Read and write Unicode UTF-8 files</label>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxCheckBox" name="chkWriteBOM">
+                    <label>Write BOM for UTF files</label>
+                    <checked>1</checked>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxCheckBox" name="chkAskSaveConfirm">
+                    <label>Do not prompt for unsaved files on exit</label>
+                    <checked>0</checked>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlQueryToolFavourites">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="stFavouritesFile">
+                    <label>Favourites file path</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxFilePickerCtrl" name="pickerFavouritesFile">
+                    <message>Select file to store favourites queries</message>
+                    <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlQueryToolMacros">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="stMacrosFile">
+                    <label>Macros file path</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxFilePickerCtrl" name="pickerMacrosFile">
+                    <message>Select file to store macros</message>
+                    <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlQueryToolHistoryFile">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="stHistoryFile">
+                    <label>History file path</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxFilePickerCtrl" name="pickerHistoryFile">
+                    <message>Select file to store queries history</message>
+                    <style>wxFLP_OPEN|wxFLP_USE_TEXTCTRL</style>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="lblHistoryMaxQueries">
+                    <label>Maximum queries to store in history</label>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="txtHistoryMaxQueries">
+                    <value>10</value>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="lblHistoryMaxQuerySize">
+                    <label>Maximum size of a stored query (in bytes)</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="txtHistoryMaxQuerySize">
+                    <value>100</value>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlServerStatus">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
+					<object class="sizeritem">
+					  <object class="wxStaticText" name="stIdleProcessColour">
+						<label>Idle Process Colour</label>
+					  </object>
+					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+					<object class="sizeritem">
+					  <object class="ctlColourPicker" name="pickerIdleProcessColour">
+						<size>70,12d</size>
+					  </object>
+					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+					<object class="sizeritem">
+					  <object class="wxStaticText" name="stActiveProcessColour">
+						<label>Active Process Colour</label>
+					  </object>
+					  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+					<object class="sizeritem">
+					  <object class="ctlColourPicker" name="pickerActiveProcessColour">
+						<size>70,12d</size>
+					  </object>
+					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+					<object class="sizeritem">
+					  <object class="wxStaticText" name="stSlowProcessColour">
+						<label>Slow Process Colour</label>
+					  </object>
+					  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+					<object class="sizeritem">
+					  <object class="ctlColourPicker" name="pickerSlowProcessColour">
+						<size>70,12d</size>
+					  </object>
+					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+					<object class="sizeritem">
+					  <object class="wxStaticText" name="stBlockedProcessColour">
+						<label>Blocked Process Colour</label>
+					  </object>
+					  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+					<object class="sizeritem">
+					  <object class="ctlColourPicker" name="pickerBlockedProcessColour">
+						<size>70,12d</size>
+					  </object>
+					  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+					  <border>4</border>
+					</object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlPgAgent">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>1</growablecols>
+                <object class="sizeritem">
+                  <object class="wxStaticText" name="lblMaxRows">
+                    <label>Maximum rows to retrieve</label>
+                  </object>
+                  <flag>wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="txtMaxRows">
+                    <value>100</value>
+                    <tooltip>Maximums rows to retrieve into output window; 0 = unlimited</tooltip>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlMiscGuruHints">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>1</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>0</growablecols>
+                <object class="sizeritem">
+                  <object class="wxCheckBox" name="chkSuppressHints">
+                    <label>Do not show guru hints; I'm one myself</label>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxCheckBox" name="chkResetHints">
+                    <label>Reset guru hints</label>
+                  </object>
+                  <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+                  <border>4</border>
+                </object>
+                </object>
+              </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
+            </object>
+            <object class="sizeritem">
+			  <object class="wxPanel" name="pnlMiscLogging">
+				  <hidden>1</hidden>
+                <object class="wxFlexGridSizer">
+                  <cols>1</cols>
+                  <vgap>5</vgap>
+                  <hgap>5</hgap>
+                  <growablecols>0</growablecols>
                 <object class="sizeritem">
                   <object class="wxStaticText" name="lblLogfile">
                     <label>Logfile (%ID will be replaced with the Process ID)</label>
@@ -1002,11 +1141,17 @@
                   <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
                   <border>4</border>
                 </object>
+                </object>
               </object>
+              <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
+              <border>4</border>
             </object>
           </object>
+            <flag>wxEXPAND|wxALL</flag>
+            <border>3</border>
+          </object>
         </object>
-        <flag>wxEXPAND|wxALL</flag>
+        <flag>wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -1052,4 +1197,4 @@
       </object>
     </object>
   </object>
-</resource>
\ No newline at end of file
+</resource>
