X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FAppXestiaAddrBk.cpp;h=f61a34e0e662cea176461753dde8b78eb0729432;hp=57ad0b1ec68b51715c8f1d977f6922aa718426c2;hb=8089428e86139e335db5f5104382ffc37dce1c42;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc

diff --git a/source/AppXestiaAddrBk.cpp b/source/AppXestiaAddrBk.cpp
index 57ad0b1..f61a34e 100644
--- a/source/AppXestiaAddrBk.cpp
+++ b/source/AppXestiaAddrBk.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Feb 26 2014)
+// C++ code generated with wxFormBuilder (version Dec 21 2016)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -29,26 +29,26 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	mnuManage->AppendSeparator();
 	
 	wxMenuItem* mnuImport;
-	mnuImport = new wxMenuItem( mnuManage, ID_MANAGE_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );
+	mnuImport = new wxMenuItem( mnuManage, ID_IMPORT, wxString( wxT("Import...") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuManage->Append( mnuImport );
 	
 	wxMenuItem* mnuExport;
-	mnuExport = new wxMenuItem( mnuManage, ID_MANAGE_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );
+	mnuExport = new wxMenuItem( mnuManage, ID_EXPORT, wxString( wxT("Export...") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuManage->Append( mnuExport );
 	
-	mnuManage->AppendSeparator();
+	mnuPrefSep = mnuManage->AppendSeparator();
 	
 	wxMenuItem* mnuPreferences;
-	mnuPreferences = new wxMenuItem( mnuManage, ID_MANAGE_PREFERENCES, wxString( wxT("Preferences...") ) , wxEmptyString, wxITEM_NORMAL );
+	mnuPreferences = new wxMenuItem( mnuManage, wxID_PREFERENCES, wxString( wxT("Preferences...") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuManage->Append( mnuPreferences );
 	
-	mnuManage->AppendSeparator();
+	mnuExitSep = mnuManage->AppendSeparator();
 	
 	wxMenuItem* mnuExit;
-	mnuExit = new wxMenuItem( mnuManage, ID_MANAGE_EXIT, wxString( wxT("Exit") ) + wxT('\t') + wxT("CTRL+Q"), wxEmptyString, wxITEM_NORMAL );
+	mnuExit = new wxMenuItem( mnuManage, wxID_EXIT, wxString( wxT("Exit") ) + wxT('\t') + wxT("CTRL+Q"), wxEmptyString, wxITEM_NORMAL );
 	#ifdef __WXMSW__
 	mnuExit->SetBitmaps( wxNullBitmap );
-	#elif defined( __WXGTK__ )
+	#elif (defined( __WXGTK__ ) || defined( __WXOSX__ ))
 	mnuExit->SetBitmap( wxNullBitmap );
 	#endif
 	mnuManage->Append( mnuExit );
@@ -57,7 +57,7 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	
 	mnuContact = new wxMenu();
 	wxMenuItem* mnuNewContact;
-	mnuNewContact = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("New Contact...") ) + wxT('\t') + wxT("CTRL+N"), wxEmptyString, wxITEM_NORMAL );
+	mnuNewContact = new wxMenuItem( mnuContact, ID_CONTACT_ADD, wxString( wxT("New Contact...") ) + wxT('\t') + wxT("CTRL+N"), wxEmptyString, wxITEM_NORMAL );
 	mnuContact->Append( mnuNewContact );
 	
 	wxMenuItem* mnuEditContact;
@@ -70,19 +70,15 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	
 	mnuContact->AppendSeparator();
 	
-	setContactAsMyself = new wxMenuItem( mnuContact, ID_SET_CONTACT_AS_MYSELF, wxString( wxT("Set contact as myself") ) + wxT('\t') + wxT("CTRL+M"), wxEmptyString, wxITEM_NORMAL );
-	mnuContact->Append( setContactAsMyself );
-	
-	m_separator5 = mnuContact->AppendSeparator();
-	
 	wxMenuItem* mnuFindContact;
-	mnuFindContact = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Find Contacts...") ) + wxT('\t') + wxT("CTRL+F"), wxEmptyString, wxITEM_NORMAL );
+	mnuFindContact = new wxMenuItem( mnuContact, ID_CONTACT_FIND, wxString( wxT("Find Contacts...") ) + wxT('\t') + wxT("CTRL+F"), wxEmptyString, wxITEM_NORMAL );
 	mnuContact->Append( mnuFindContact );
 	
 	mnuMain->Append( mnuContact, wxT("Contact") ); 
 	
 	mnuView = new wxMenu();
 	mnuShowContactsAs = new wxMenu();
+	wxMenuItem* mnuShowContactsAsItem = new wxMenuItem( mnuView, wxID_ANY, wxT("Show Contacts As"), wxEmptyString, wxITEM_NORMAL, mnuShowContactsAs );
 	wxMenuItem* mnuViewFNLN;
 	mnuViewFNLN = new wxMenuItem( mnuShowContactsAs, ID_VIEW_FNLN, wxString( wxT("First Name, Last Name") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuShowContactsAs->Append( mnuViewFNLN );
@@ -99,9 +95,10 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	mnuViewDisplayAs = new wxMenuItem( mnuShowContactsAs, wxID_ANY, wxString( wxT("Display As Name") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuShowContactsAs->Append( mnuViewDisplayAs );
 	
-	mnuView->Append( -1, wxT("Show Contacts As"), mnuShowContactsAs );
+	mnuView->Append( mnuShowContactsAsItem );
 	
 	mnuViewSortBy = new wxMenu();
+	wxMenuItem* mnuViewSortByItem = new wxMenuItem( mnuView, wxID_ANY, wxT("Sort By"), wxEmptyString, wxITEM_NORMAL, mnuViewSortBy );
 	wxMenuItem* mnuViewAsc;
 	mnuViewAsc = new wxMenuItem( mnuViewSortBy, ID_VIEW_ASC, wxString( wxT("Ascending") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuViewSortBy->Append( mnuViewAsc );
@@ -110,14 +107,15 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	mnuViewDesc = new wxMenuItem( mnuViewSortBy, ID_VIEW_DESC, wxString( wxT("Descending") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuViewSortBy->Append( mnuViewDesc );
 	
-	mnuView->Append( -1, wxT("Sort By"), mnuViewSortBy );
+	mnuView->Append( mnuViewSortByItem );
 	
 	mnuViewShow = new wxMenu();
+	wxMenuItem* mnuViewShowItem = new wxMenuItem( mnuView, wxID_ANY, wxT("Show"), wxEmptyString, wxITEM_NORMAL, mnuViewShow );
 	wxMenuItem* mnuViewStatusBar;
 	mnuViewStatusBar = new wxMenuItem( mnuViewShow, ID_VIEW_STATUSBAR, wxString( wxT("Status Bar") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuViewShow->Append( mnuViewStatusBar );
 	
-	mnuView->Append( -1, wxT("Show"), mnuViewShow );
+	mnuView->Append( mnuViewShowItem );
 	
 	mnuView->AppendSeparator();
 	
@@ -156,10 +154,10 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	mnuHelpUpdates = new wxMenuItem( mnuHelp, ID_MANAGE_UPDATE, wxString( wxT("Check for updates...") ) , wxEmptyString, wxITEM_NORMAL );
 	mnuHelp->Append( mnuHelpUpdates );
 	
-	mnuHelp->AppendSeparator();
+	mnuHelpAboutSep = mnuHelp->AppendSeparator();
 	
 	wxMenuItem* mnuAbout;
-	mnuAbout = new wxMenuItem( mnuHelp, ID_HELP_ABOUT, wxString( wxT("About") ) + wxT('\t') + wxT("SHIFT+CTRL+A"), wxEmptyString, wxITEM_NORMAL );
+	mnuAbout = new wxMenuItem( mnuHelp, wxID_ABOUT, wxString( wxT("About") ) + wxT('\t') + wxT("SHIFT+CTRL+A"), wxEmptyString, wxITEM_NORMAL );
 	mnuHelp->Append( mnuAbout );
 	
 	mnuMain->Append( mnuHelp, wxT("Help") ); 
@@ -185,20 +183,9 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	m_splitter13->SetMinimumPaneSize( 1 );
 	
 	m_panel19 = new wxPanel( m_splitter13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	szrContactList = new wxFlexGridSizer( 0, 1, 0, 0 );
-	szrContactList->AddGrowableCol( 0 );
-	szrContactList->AddGrowableRow( 1 );
-	szrContactList->SetFlexibleDirection( wxBOTH );
-	szrContactList->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	szrAccList = new wxFlexGridSizer( 0, 2, 0, 0 );
-	szrAccList->SetFlexibleDirection( wxVERTICAL );
-	szrAccList->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	szrContactList->Add( szrAccList, 0, 0, 5 );
+	szrContactList = new wxBoxSizer( wxVERTICAL );
 	
-	lstContacts = new wxListCtrl( m_panel19, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_HEADER|wxLC_REPORT|wxSUNKEN_BORDER );
+	lstContacts = new wxListCtrl( m_panel19, wxID_ANY, wxDefaultPosition, wxSize( 50,-1 ), wxLC_NO_HEADER|wxLC_REPORT|wxSUNKEN_BORDER );
 	szrContactList->Add( lstContacts, 1, wxALL|wxEXPAND, 5 );
 	
 	
@@ -216,17 +203,39 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	m_panel20->SetSizer( bSizer12 );
 	m_panel20->Layout();
 	bSizer12->Fit( m_panel20 );
-	m_splitter13->SplitVertically( m_panel19, m_panel20, 184 );
+	m_splitter13->SplitVertically( m_panel19, m_panel20, 201 );
 	szrMain->Add( m_splitter13, 1, wxEXPAND, 5 );
 	
 	
 	this->SetSizer( szrMain );
 	this->Layout();
-	stbBottom = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
+	stbBottom = this->CreateStatusBar( 1, 0, wxID_ANY );
+	tblMain = this->CreateToolBar( wxTB_HORIZONTAL, wxID_ANY ); 
+	tbtNewAccount = tblMain->AddTool( ID_MANAGE_NEWAB, wxT("New Address Book"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("New Address Book"), wxT("Setup a new local or remote address book"), NULL ); 
+	
+	tblMain->AddSeparator(); 
+	
+	tbtPreferences = tblMain->AddTool( wxID_PREFERENCES, wxT("Preferences"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Preferences"), wxT("View or change application settings"), NULL ); 
+	
+	tblMain->AddSeparator(); 
+	
+	tbtSearch = tblMain->AddTool( ID_CONTACT_FIND, wxT("Search Contacts"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Search Contacts"), wxT("Search for contacts in address books"), NULL ); 
+	
+	tblMain->AddSeparator(); 
+	
+	tbtAddContact = tblMain->AddTool( ID_CONTACT_ADD, wxT("Add Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Add Contact"), wxT("Add a new contact"), NULL ); 
+	
+	tbtEditContact = tblMain->AddTool( ID_CONTACT_EDIT, wxT("Edit Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Edit Contact"), wxT("Edit a contact"), NULL ); 
+	
+	tbtDeleteContact = tblMain->AddTool( ID_CONTACT_DELETE, wxT("Delete Contact"), wxBitmap( 1, 1, wxBITMAP_SCREEN_DEPTH ), wxNullBitmap, wxITEM_NORMAL, wxT("Delete Contact"), wxT("Delete a contact"), NULL ); 
+	
+	tblMain->Realize(); 
+	
 	
 	this->Centre( wxBOTH );
 	
 	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) );
 	this->Connect( mnuNewAB->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) );
 	this->Connect( mnuRefreshAB->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) );
 	this->Connect( mnuImport->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );
@@ -236,7 +245,6 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	this->Connect( mnuNewContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) );
 	this->Connect( mnuEditContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorEdit ) );
 	this->Connect( deleteContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::DeleteContact ) );
-	this->Connect( setContactAsMyself->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SetContactAsSelf ) );
 	this->Connect( mnuFindContact->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) );
 	this->Connect( mnuViewFNLN->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortFNLN ) );
 	this->Connect( mnuViewLNFN->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortLNFN ) );
@@ -252,9 +260,10 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 	this->Connect( showHelp->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowHelp ) );
 	this->Connect( mnuHelpUpdates->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::CheckUpdates ) );
 	this->Connect( mnuAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) );
-	lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfo ), NULL, this );
+	lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfoList ), NULL, this );
 	lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );
 	lstContacts->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );
+	lstContacts->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactMenu ), NULL, this );
 	htmContactData->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactSubmenu ), NULL, this );
 	stbBottom->Connect( wxEVT_SIZE, wxSizeEventHandler( frmMainADT::UpdateSBIconPlacement ), NULL, this );
 }
@@ -262,17 +271,17 @@ frmMainADT::frmMainADT( wxWindow* parent, wxWindowID id, const wxString& title,
 frmMainADT::~frmMainADT()
 {
 	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( frmMainADT::QuitApp ) );
 	this->Disconnect( ID_MANAGE_NEWAB, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenNewABDialog ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::RefreshAddressBook ) );
-	this->Disconnect( ID_MANAGE_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );
-	this->Disconnect( ID_MANAGE_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );
-	this->Disconnect( ID_MANAGE_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) );
-	this->Disconnect( ID_MANAGE_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) );
+	this->Disconnect( ID_IMPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenImportDialog ) );
+	this->Disconnect( ID_EXPORT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenExportDialog ) );
+	this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenPreferences ) );
+	this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::QuitApp ) );
+	this->Disconnect( ID_CONTACT_ADD, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorNew ) );
 	this->Disconnect( ID_CONTACT_EDIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowContactEditorEdit ) );
 	this->Disconnect( ID_CONTACT_DELETE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::DeleteContact ) );
-	this->Disconnect( ID_SET_CONTACT_AS_MYSELF, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SetContactAsSelf ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) );
+	this->Disconnect( ID_CONTACT_FIND, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::OpenFindContactsWindow ) );
 	this->Disconnect( ID_VIEW_FNLN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortFNLN ) );
 	this->Disconnect( ID_VIEW_LNFN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortLNFN ) );
 	this->Disconnect( ID_VIEW_NICK, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::SortNickname ) );
@@ -286,10 +295,11 @@ frmMainADT::~frmMainADT()
 	this->Disconnect( ID_MANAGE_PASTE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::PasteAction ) );
 	this->Disconnect( ID_HELP_SHOW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowHelp ) );
 	this->Disconnect( ID_MANAGE_UPDATE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::CheckUpdates ) );
-	this->Disconnect( ID_HELP_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) );
-	lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfo ), NULL, this );
+	this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmMainADT::ShowAboutWindow ) );
+	lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_ACTIVATED, wxListEventHandler( frmMainADT::OpenContactInfoList ), NULL, this );
 	lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );
 	lstContacts->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmMainADT::ShowContactInfo ), NULL, this );
+	lstContacts->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactMenu ), NULL, this );
 	htmContactData->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmMainADT::ShowContactSubmenu ), NULL, this );
 	stbBottom->Disconnect( wxEVT_SIZE, wxSizeEventHandler( frmMainADT::UpdateSBIconPlacement ), NULL, this );
 	
@@ -317,6 +327,8 @@ frmUpdateADT::frmUpdateADT( wxWindow* parent, wxWindowID id, const wxString& tit
 	
 	lblRunningVer = new wxStaticText( pnlUpdateData, wxID_ANY, wxT("UPDATEVER"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblRunningVer->Wrap( -1 );
+	lblRunningVer->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
+	
 	fgSizer45->Add( lblRunningVer, 0, wxALL, 5 );
 	
 	lblAvailableText = new wxStaticText( pnlUpdateData, wxID_ANY, wxT("Available version is:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -391,7 +403,7 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit
 {
 	this->SetSizeHints( wxSize( 300,450 ), wxDefaultSize );
 	
-	stbBottom = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
+	stbBottom = this->CreateStatusBar( 1, 0, wxID_ANY );
 	wxBoxSizer* bSizer368;
 	bSizer368 = new wxBoxSizer( wxVERTICAL );
 	
@@ -477,11 +489,9 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit
 	mnuContactOpen = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Open Contact...") ) + wxT('\t') + wxT("CTRL+O"), wxEmptyString, wxITEM_NORMAL );
 	mnuContact->Append( mnuContactOpen );
 	
-	wxMenuItem* mnuContactEdit;
 	mnuContactEdit = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Edit Contact...") ) + wxT('\t') + wxT("CTRL+E"), wxEmptyString, wxITEM_NORMAL );
 	mnuContact->Append( mnuContactEdit );
 	
-	wxMenuItem* mnuContactReveal;
 	mnuContactReveal = new wxMenuItem( mnuContact, wxID_ANY, wxString( wxT("Reveal Contact") ) + wxT('\t') + wxT("CTRL+R"), wxEmptyString, wxITEM_NORMAL );
 	mnuContact->Append( mnuContactReveal );
 	
@@ -503,6 +513,7 @@ frmSearchADT::frmSearchADT( wxWindow* parent, wxWindowID id, const wxString& tit
 	btnSelectAccounts->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SelectAccounts ), NULL, this );
 	btnSearch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SearchContacts ), NULL, this );
 	btnReset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::ResetContacts ), NULL, this );
+	lstResults->Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmSearchADT::ShowContactMenu ), NULL, this );
 	this->Connect( mnuContactOpen->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::OpenContact ) );
 	this->Connect( mnuContactEdit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::EditContact ) );
 	this->Connect( mnuContactReveal->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::RevealContact ) );
@@ -516,6 +527,7 @@ frmSearchADT::~frmSearchADT()
 	btnSelectAccounts->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SelectAccounts ), NULL, this );
 	btnSearch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::SearchContacts ), NULL, this );
 	btnReset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmSearchADT::ResetContacts ), NULL, this );
+	lstResults->Disconnect( wxEVT_RIGHT_UP, wxMouseEventHandler( frmSearchADT::ShowContactMenu ), NULL, this );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::OpenContact ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::EditContact ) );
 	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( frmSearchADT::RevealContact ) );
@@ -535,20 +547,35 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
 	
 	NbtPreferences = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* szrChecks;
-	szrChecks = new wxBoxSizer( wxVERTICAL );
+	wxFlexGridSizer* szrGeneral;
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	bmpWindowPosition = new wxStaticBitmap( tabGeneral, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+	bmpWindowPosition->SetMinSize( wxSize( 32,32 ) );
+	bmpWindowPosition->SetMaxSize( wxSize( 32,32 ) );
+	
+	szrGeneral->Add( bmpWindowPosition, 0, wxALL, 5 );
 	
 	chkSaveWindowPosition = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Save window position on exit"), wxDefaultPosition, wxDefaultSize, 0 );
-	szrChecks->Add( chkSaveWindowPosition, 0, wxALL, 5 );
+	szrGeneral->Add( chkSaveWindowPosition, 0, wxALL, 5 );
+	
+	bmpLocalAddressBooks = new wxStaticBitmap( tabGeneral, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+	bmpLocalAddressBooks->SetMinSize( wxSize( 32,32 ) );
+	bmpLocalAddressBooks->SetMaxSize( wxSize( 32,32 ) );
+	
+	szrGeneral->Add( bmpLocalAddressBooks, 0, wxALL, 5 );
 	
 	chkHideLocal = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Hide local address books"), wxDefaultPosition, wxDefaultSize, 0 );
-	szrChecks->Add( chkHideLocal, 0, wxALL, 5 );
+	szrGeneral->Add( chkHideLocal, 0, wxALL, 5 );
 	
 	
-	tabGeneral->SetSizer( szrChecks );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	szrChecks->Fit( tabGeneral );
-	NbtPreferences->AddPage( tabGeneral, wxT("General"), false );
+	szrGeneral->Fit( tabGeneral );
+	NbtPreferences->AddPage( tabGeneral, wxT("General"), true );
 	tabTheme = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	tabTheme->Hide();
 	
@@ -624,7 +651,25 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
 	tabAccounts->SetSizer( szrAccounts );
 	tabAccounts->Layout();
 	szrAccounts->Fit( tabAccounts );
-	NbtPreferences->AddPage( tabAccounts, wxT("Accounts"), true );
+	NbtPreferences->AddPage( tabAccounts, wxT("Accounts"), false );
+	tabContacts = new wxPanel( NbtPreferences, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxFlexGridSizer* szrContacts;
+	szrContacts = new wxFlexGridSizer( 1, 2, 0, 0 );
+	szrContacts->AddGrowableCol( 0 );
+	szrContacts->SetFlexibleDirection( wxBOTH );
+	szrContacts->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	chkUseBackgroundColour = new wxCheckBox( tabContacts, wxID_ANY, wxT("Use different background colour"), wxDefaultPosition, wxDefaultSize, 0 );
+	szrContacts->Add( chkUseBackgroundColour, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	clpContactBackgroundColour = new wxColourPickerCtrl( tabContacts, wxID_ANY, wxColour( 255, 255, 255 ), wxDefaultPosition, wxDefaultSize, wxCLRP_DEFAULT_STYLE );
+	szrContacts->Add( clpContactBackgroundColour, 0, wxALL, 5 );
+	
+	
+	tabContacts->SetSizer( szrContacts );
+	tabContacts->Layout();
+	szrContacts->Fit( tabContacts );
+	NbtPreferences->AddPage( tabContacts, wxT("Contacts"), false );
 	
 	szrTabs->Add( NbtPreferences, 1, wxALL|wxEXPAND, 5 );
 	
@@ -666,11 +711,13 @@ frmPreferencesADT::frmPreferencesADT( wxWindow* parent, wxWindowID id, const wxS
 	btnThemeAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnThemeModify->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnThemeDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	lstAccounts->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	lstAccounts->Connect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmPreferencesADT::DisableABButtons ), NULL, this );
 	lstAccounts->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmPreferencesADT::EnableABButtons ), NULL, this );
 	btnAccountAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnAccountModify->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnAccountDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	chkUseBackgroundColour->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmPreferencesADT::EnableBackgroundColourPicker ), NULL, this );
 	btnSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::SavePreferences ), NULL, this );
 	btnCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::CloseWindow ), NULL, this );
 }
@@ -684,11 +731,13 @@ frmPreferencesADT::~frmPreferencesADT()
 	btnThemeAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnThemeModify->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnThemeDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	lstAccounts->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	lstAccounts->Disconnect( wxEVT_COMMAND_LIST_ITEM_DESELECTED, wxListEventHandler( frmPreferencesADT::DisableABButtons ), NULL, this );
 	lstAccounts->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmPreferencesADT::EnableABButtons ), NULL, this );
 	btnAccountAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::AddABAccount ), NULL, this );
 	btnAccountModify->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::ModifyABAccount ), NULL, this );
 	btnAccountDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::DeleteABAccount ), NULL, this );
+	chkUseBackgroundColour->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmPreferencesADT::EnableBackgroundColourPicker ), NULL, this );
 	btnSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::SavePreferences ), NULL, this );
 	btnCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmPreferencesADT::CloseWindow ), NULL, this );
 	
@@ -716,7 +765,7 @@ frmAboutADT::frmAboutADT( wxWindow* parent, wxWindowID id, const wxString& title
 	
 	lblVersion = new wxStaticText( this, wxID_ANY, wxT("Version 0.00"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblVersion->Wrap( -1 );
-	lblVersion->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
+	lblVersion->SetFont( wxFont( 14, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 	
 	szrDetails->Add( lblVersion, 0, wxALL, 5 );
 	
@@ -843,7 +892,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
 	fgSizer33->Add( lblServerAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtServerAddress = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtServerAddress->SetMaxLength( 0 ); 
 	fgSizer33->Add( txtServerAddress, 1, wxALL|wxEXPAND, 5 );
 	
 	lblServerPort = new wxStaticText( tabType, wxID_ANY, wxT("Server Port:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -851,7 +899,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
 	fgSizer33->Add( lblServerPort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtServerPort = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtServerPort->SetMaxLength( 0 ); 
 	fgSizer33->Add( txtServerPort, 0, wxALL, 5 );
 	
 	lblUsername = new wxStaticText( tabType, wxID_ANY, wxT("Username:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -859,7 +906,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
 	fgSizer33->Add( lblUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtUsername = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtUsername->SetMaxLength( 0 ); 
 	fgSizer33->Add( txtUsername, 1, wxALL|wxEXPAND, 5 );
 	
 	lblPassword = new wxStaticText( tabType, wxID_ANY, wxT("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -867,7 +913,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
 	fgSizer33->Add( lblPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtPassword = new wxTextCtrl( tabType, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
-	txtPassword->SetMaxLength( 0 ); 
 	fgSizer33->Add( txtPassword, 0, wxALL|wxEXPAND, 5 );
 	
 	lblSSL = new wxStaticText( tabType, wxID_ANY, wxT("SSL:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -901,7 +946,7 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
 	
 	lblConnectionResult = new wxStaticText( tabConn, wxID_ANY, wxT("Connection Results:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblConnectionResult->Wrap( -1 );
-	lblConnectionResult->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Sans") ) );
+	lblConnectionResult->SetFont( wxFont( 9, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxT("Sans") ) );
 	
 	bSizer323->Add( lblConnectionResult, 0, wxALL, 5 );
 	
@@ -997,7 +1042,6 @@ frmNewAccountADT::frmNewAccountADT( wxWindow* parent, wxWindowID id, const wxStr
 	fgSizer341->Add( lblAccountName, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtAccountName = new wxTextCtrl( tabFinish, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtAccountName->SetMaxLength( 0 ); 
 	fgSizer341->Add( txtAccountName, 1, wxALL|wxEXPAND, 5 );
 	
 	
@@ -1055,7 +1099,7 @@ frmNewAccountADT::~frmNewAccountADT()
 
 frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
+	this->SetSizeHints( wxSize( 800,500 ), wxDefaultSize );
 	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 	
 	wxBoxSizer* bSizer17;
@@ -1075,7 +1119,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	gSizer7->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtTitle = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtTitle->SetMaxLength( 0 ); 
 	gSizer7->Add( txtTitle, 0, wxALL|wxEXPAND, 5 );
 	
 	
@@ -1095,7 +1138,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	gSizer7->Add( lblForename, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtForename = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtForename->SetMaxLength( 0 ); 
 	gSizer7->Add( txtForename, 0, wxALL|wxEXPAND, 5 );
 	
 	lblSurname = new wxStaticText( tabGeneral, wxID_ANY, wxT("Surname:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -1103,7 +1145,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	gSizer7->Add( lblSurname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtSurname = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtSurname->SetMaxLength( 0 ); 
 	gSizer7->Add( txtSurname, 0, wxALL|wxEXPAND, 5 );
 	
 	lblOtherNames = new wxStaticText( tabGeneral, wxID_ANY, wxT("Other Names:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -1111,7 +1152,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	gSizer7->Add( lblOtherNames, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtOtherNames = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtOtherNames->SetMaxLength( 0 ); 
 	gSizer7->Add( txtOtherNames, 0, wxALL|wxEXPAND, 5 );
 	
 	lblSuffix = new wxStaticText( tabGeneral, wxID_ANY, wxT("Suffix:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -1119,7 +1159,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	gSizer7->Add( lblSuffix, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtSuffix = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtSuffix->SetMaxLength( 0 ); 
 	gSizer7->Add( txtSuffix, 0, wxALL|wxEXPAND, 5 );
 	
 	
@@ -1152,14 +1191,13 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	bSizer318 = new wxBoxSizer( wxHORIZONTAL );
 	
 	dapBirthday = new wxDatePickerCtrl( tabGeneral, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_ALLOWNONE|wxDP_DEFAULT|wxDP_DROPDOWN|wxDP_SHOWCENTURY );
-	dapBirthday->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+	dapBirthday->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
 	dapBirthday->SetToolTip( wxT("If you don't wish to enter a year, please use '0000' as the year.") );
 	dapBirthday->SetMinSize( wxSize( -1,25 ) );
 	
 	bSizer318->Add( dapBirthday, 0, wxALL|wxEXPAND, 5 );
 	
 	txtBirthday = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtBirthday->SetMaxLength( 0 ); 
 	bSizer318->Add( txtBirthday, 1, wxALL, 5 );
 	
 	
@@ -1179,7 +1217,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	bSizer319->Add( dapAnniversary, 0, wxALL|wxEXPAND, 5 );
 	
 	txtAnniversary = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtAnniversary->SetMaxLength( 0 ); 
 	bSizer319->Add( txtAnniversary, 1, wxALL, 5 );
 	
 	
@@ -1199,7 +1236,6 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	bSizer20->Add( cmbGender, 0, wxALL, 5 );
 	
 	txtGenderDescription = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtGenderDescription->SetMaxLength( 0 ); 
 	bSizer20->Add( txtGenderDescription, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	
@@ -1782,7 +1818,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	tabGeneral->SetSizer( bSizer18 );
 	tabGeneral->Layout();
 	bSizer18->Fit( tabGeneral );
-	nbkContact->AddPage( tabGeneral, wxT("General"), false );
+	nbkContact->AddPage( tabGeneral, wxT("General"), true );
 	tabHome = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
 	tabHome->SetScrollRate( 5, 5 );
 	wxBoxSizer* bSizer181;
@@ -2970,20 +3006,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	wxBoxSizer* bSizer212;
 	bSizer212 = new wxBoxSizer( wxVERTICAL );
 	
-	wxBoxSizer* bSizer213;
-	bSizer213 = new wxBoxSizer( wxHORIZONTAL );
+	wxFlexGridSizer* fgSizer46;
+	fgSizer46 = new wxFlexGridSizer( 2, 3, 0, 0 );
+	fgSizer46->SetFlexibleDirection( wxBOTH );
+	fgSizer46->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	btnAddPicture = new wxButton( tabPictures, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer213->Add( btnAddPicture, 0, wxALL, 5 );
+	fgSizer46->Add( btnAddPicture, 0, wxALL, 5 );
 	
 	btnModifyPicture = new wxButton( tabPictures, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer213->Add( btnModifyPicture, 0, wxALL, 5 );
+	fgSizer46->Add( btnModifyPicture, 0, wxALL, 5 );
 	
 	btnDeletePicture = new wxButton( tabPictures, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer213->Add( btnDeletePicture, 0, wxALL, 5 );
+	fgSizer46->Add( btnDeletePicture, 0, wxALL, 5 );
 	
+	btnSavePicture = new wxButton( tabPictures, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer46->Add( btnSavePicture, 0, wxALL, 5 );
 	
-	bSizer212->Add( bSizer213, 1, wxEXPAND, 5 );
+	
+	bSizer212->Add( fgSizer46, 1, wxEXPAND, 5 );
 	
 	
 	bSizer211->Add( bSizer212, 0, wxEXPAND, 5 );
@@ -3013,20 +3054,25 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	wxBoxSizer* bSizer2121;
 	bSizer2121 = new wxBoxSizer( wxVERTICAL );
 	
-	wxBoxSizer* bSizer2131;
-	bSizer2131 = new wxBoxSizer( wxHORIZONTAL );
+	wxFlexGridSizer* fgSizer47;
+	fgSizer47 = new wxFlexGridSizer( 2, 3, 0, 0 );
+	fgSizer47->SetFlexibleDirection( wxBOTH );
+	fgSizer47->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	btnAddLogo = new wxButton( tabLogo, wxID_ANY, wxT("Add"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2131->Add( btnAddLogo, 0, wxALL, 5 );
+	fgSizer47->Add( btnAddLogo, 0, wxALL, 5 );
 	
 	btnModifyLogo = new wxButton( tabLogo, wxID_ANY, wxT("Modify"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2131->Add( btnModifyLogo, 0, wxALL, 5 );
+	fgSizer47->Add( btnModifyLogo, 0, wxALL, 5 );
 	
 	btnDeleteLogo = new wxButton( tabLogo, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2131->Add( btnDeleteLogo, 0, wxALL, 5 );
+	fgSizer47->Add( btnDeleteLogo, 0, wxALL, 5 );
+	
+	btnSaveLogo = new wxButton( tabLogo, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer47->Add( btnSaveLogo, 0, wxALL, 5 );
 	
 	
-	bSizer2121->Add( bSizer2131, 1, wxEXPAND, 5 );
+	bSizer2121->Add( fgSizer47, 1, wxEXPAND, 5 );
 	
 	
 	bSizer2111->Add( bSizer2121, 0, wxEXPAND, 5 );
@@ -3065,6 +3111,9 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	btnDeleteSound = new wxButton( tabSounds, wxID_ANY, wxT("Delete"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer472111->Add( btnDeleteSound, 0, wxALL, 5 );
 	
+	btnSaveSound = new wxButton( tabSounds, wxID_ANY, wxT("Save"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer472111->Add( btnSaveSound, 0, wxALL, 5 );
+	
 	m_staticline1 = new wxStaticLine( tabSounds, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	bSizer472111->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
 	
@@ -3097,7 +3146,7 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	tabSounds->SetSizer( szrAddresses1111 );
 	tabSounds->Layout();
 	szrAddresses1111->Fit( tabSounds );
-	nbkContact->AddPage( tabSounds, wxT("Sounds"), true );
+	nbkContact->AddPage( tabSounds, wxT("Sounds"), false );
 	tabCalendaring = new wxScrolledWindow( nbkContact, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
 	tabCalendaring->SetScrollRate( 5, 5 );
 	wxBoxSizer* bSizer1821;
@@ -3554,13 +3603,16 @@ frmContactEditorADT::frmContactEditorADT( wxWindow* parent, wxWindowID id, const
 	btnAddPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this );
 	btnModifyPicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this );
 	btnDeletePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this );
+	btnSavePicture->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this );
 	lboLogos->Connect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this );
 	btnAddLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this );
 	btnModifyLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this );
 	btnDeleteLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this );
+	btnSaveLogo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this );
 	btnAddSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this );
 	btnModifySound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this );
 	btnDeleteSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this );
+	btnSaveSound->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this );
 	btnPlay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this );
 	btnStop->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this );
 	btnAddCalendarAddress->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this );
@@ -3731,13 +3783,16 @@ frmContactEditorADT::~frmContactEditorADT()
 	btnAddPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddPicture ), NULL, this );
 	btnModifyPicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyPicture ), NULL, this );
 	btnDeletePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeletePicture ), NULL, this );
+	btnSavePicture->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SavePicture ), NULL, this );
 	lboLogos->Disconnect( wxEVT_COMMAND_LIST_ITEM_SELECTED, wxListEventHandler( frmContactEditorADT::LoadLogo ), NULL, this );
 	btnAddLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddLogo ), NULL, this );
 	btnModifyLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifyLogo ), NULL, this );
 	btnDeleteLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteLogo ), NULL, this );
+	btnSaveLogo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveLogo ), NULL, this );
 	btnAddSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddSound ), NULL, this );
 	btnModifySound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::ModifySound ), NULL, this );
 	btnDeleteSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::DeleteSound ), NULL, this );
+	btnSaveSound->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::SaveSound ), NULL, this );
 	btnPlay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::PlaySound ), NULL, this );
 	btnStop->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::StopSound ), NULL, this );
 	btnAddCalendarAddress->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorADT::AddCalendarAddress ), NULL, this );
@@ -3777,7 +3832,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 0 );
+	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
 	fgSizer6->AddGrowableCol( 1 );
 	fgSizer6->SetFlexibleDirection( wxVERTICAL );
 	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -3787,7 +3842,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	fgSizer6->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtAddress = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtAddress->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtAddress, 0, wxALL|wxEXPAND, 5 );
 	
 	m_staticText61 = new wxStaticText( tabGeneral, wxID_ANY, wxT("Town/City:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -3795,7 +3849,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	fgSizer6->Add( m_staticText61, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtTownCity = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtTownCity->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtTownCity, 0, wxALL|wxEXPAND, 5 );
 	
 	lblCountyState = new wxStaticText( tabGeneral, wxID_ANY, wxT("County:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -3803,7 +3856,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	fgSizer6->Add( lblCountyState, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtCounty = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtCounty->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtCounty, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPostCode = new wxStaticText( tabGeneral, wxID_ANY, wxT("Post Code:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -3811,7 +3863,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	fgSizer6->Add( lblPostCode, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtPostCode = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtPostCode->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtPostCode, 0, wxALL, 5 );
 	
 	lblCountry = new wxStaticText( tabGeneral, wxID_ANY, wxT("Country:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -3819,7 +3870,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	fgSizer6->Add( lblCountry, 0, wxALL, 5 );
 	
 	txtCountry = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtCountry->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtCountry, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -3883,7 +3933,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	bSizer253->Add( btnCopyMailing, 0, wxALL, 5 );
 	
 	txtLabel = new wxTextCtrl( tabLabel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	txtLabel->SetMaxLength( 0 ); 
 	bSizer253->Add( txtLabel, 1, wxALL|wxEXPAND, 5 );
 	
 	
@@ -3893,7 +3942,7 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	nbkAddress->AddPage( tabLabel, wxT("Label"), false );
 	tabOther = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer61;
-	fgSizer61 = new wxFlexGridSizer( 2, 2, 0, 0 );
+	fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 );
 	fgSizer61->AddGrowableCol( 1 );
 	fgSizer61->SetFlexibleDirection( wxVERTICAL );
 	fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@@ -3910,7 +3959,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	fgSizer61->Add( lblGeography, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtGeo = new wxTextCtrl( tabOther, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtGeo->SetMaxLength( 0 ); 
 	fgSizer61->Add( txtGeo, 0, wxALL|wxEXPAND, 5 );
 	
 	lblTimezone = new wxStaticText( tabOther, wxID_ANY, wxT("Timezone:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -3918,7 +3966,6 @@ frmContactEditorAddressADT::frmContactEditorAddressADT( wxWindow* parent, wxWind
 	fgSizer61->Add( lblTimezone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtTimezone = new wxTextCtrl( tabOther, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtTimezone->SetMaxLength( 0 ); 
 	fgSizer61->Add( txtTimezone, 0, wxALL|wxEXPAND, 5 );
 	
 	
@@ -3994,7 +4041,7 @@ frmConflictResolutionADT::frmConflictResolutionADT( wxWindow* parent, wxWindowID
 	wxBoxSizer* bSizer365;
 	bSizer365 = new wxBoxSizer( wxVERTICAL );
 	
-	htmClient = new wxHtmlWindow( m_panel44, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
+	htmClient = new wxHtmlWindow( m_panel44, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER );
 	bSizer365->Add( htmClient, 1, wxALL|wxEXPAND, 5 );
 	
 	
@@ -4005,7 +4052,7 @@ frmConflictResolutionADT::frmConflictResolutionADT( wxWindow* parent, wxWindowID
 	wxBoxSizer* bSizer366;
 	bSizer366 = new wxBoxSizer( wxVERTICAL );
 	
-	htmServer = new wxHtmlWindow( m_panel45, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
+	htmServer = new wxHtmlWindow( m_panel45, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER );
 	bSizer366->Add( htmServer, 1, wxALL|wxEXPAND, 5 );
 	
 	
@@ -4065,7 +4112,7 @@ frmConflictResolutionADT::~frmConflictResolutionADT()
 
 frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 400,300 ), wxDefaultSize );
+	this->SetSizeHints( wxSize( 400,425 ), wxDefaultSize );
 	
 	mnuMenuBar = new wxMenuBar( 0 );
 	mnuWindow = new wxMenu();
@@ -4083,13 +4130,7 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS
 	
 	mnuWindow->AppendSeparator();
 	
-	wxMenuItem* mnuSleepMode;
 	mnuSleepMode = new wxMenuItem( mnuWindow, wxID_ANY, wxString( wxT("Sleep Mode") ) , wxEmptyString, wxITEM_CHECK );
-	#ifdef __WXMSW__
-	mnuSleepMode->SetBitmaps( wxNullBitmap );
-	#elif defined( __WXGTK__ )
-	mnuSleepMode->SetBitmap( wxNullBitmap );
-	#endif
 	mnuWindow->Append( mnuSleepMode );
 	
 	mnuWindow->AppendSeparator();
@@ -4127,7 +4168,7 @@ frmActivityMgrADT::frmActivityMgrADT( wxWindow* parent, wxWindowID id, const wxS
 	
 	lblDetails = new wxStaticText( m_panel46, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
 	lblDetails->Wrap( -1 );
-	bSizer364->Add( lblDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 0 );
+	bSizer364->Add( lblDetails, 0, wxALL|wxEXPAND, 0 );
 	
 	
 	bSizer364->Add( 0, 0, 1, wxEXPAND, 5 );
@@ -4202,72 +4243,26 @@ frmContactEditorNicknameADT::frmContactEditorNicknameADT( wxWindow* parent, wxWi
 	
 	nbkAddress = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblNickname = new wxStaticText( tabGeneral, wxID_ANY, wxT("Nickname:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblNickname->Wrap( -1 );
-	fgSizer6->Add( lblNickname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblNickname, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtNickname = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtNickname->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtNickname, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtNickname, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
 	
-	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkAddress->AddPage( tabGeneral, wxT("General"), true );
 	tabOther = new wxPanel( nbkAddress, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer61;
@@ -4311,7 +4306,6 @@ frmContactEditorNicknameADT::frmContactEditorNicknameADT( wxWindow* parent, wxWi
 	
 	// Connect Events
 	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( frmContactEditorNicknameADT::InitAddressEditor ) );
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::ProcessData ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::CloseWindow ), NULL, this );
 }
@@ -4320,7 +4314,6 @@ frmContactEditorNicknameADT::~frmContactEditorNicknameADT()
 {
 	// Disconnect Events
 	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( frmContactEditorNicknameADT::InitAddressEditor ) );
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::ProcessData ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNicknameADT::CloseWindow ), NULL, this );
 	
@@ -4403,72 +4396,26 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID
 	
 	nbkRole = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkRole, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblRole = new wxStaticText( tabGeneral, wxID_ANY, wxT("Role Name:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblRole->Wrap( -1 );
-	fgSizer6->Add( lblRole, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblRole, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtRole = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtRole->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtRole, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtRole, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
 	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkRole->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkRole, 1, wxEXPAND | wxALL, 5 );
@@ -4492,7 +4439,6 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::CloseWindow ), NULL, this );
 }
@@ -4500,7 +4446,6 @@ frmContactEditorRolesADT::frmContactEditorRolesADT( wxWindow* parent, wxWindowID
 frmContactEditorRolesADT::~frmContactEditorRolesADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRolesADT::CloseWindow ), NULL, this );
 	
@@ -4515,79 +4460,33 @@ frmContactEditorOrganisationsADT::frmContactEditorOrganisationsADT( wxWindow* pa
 	
 	nbkOrganisation = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkOrganisation, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxBOTH );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblOrganisation = new wxStaticText( tabGeneral, wxID_ANY, wxT("Organisation:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblOrganisation->Wrap( -1 );
-	fgSizer6->Add( lblOrganisation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblOrganisation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtOrganisation = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtOrganisation->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtOrganisation, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtOrganisation, 0, wxALL|wxEXPAND, 5 );
 	
 	lblSortAs = new wxStaticText( tabGeneral, wxID_ANY, wxT("Sort As:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblSortAs->Wrap( -1 );
-	fgSizer6->Add( lblSortAs, 0, wxALL, 5 );
+	szrGeneral->Add( lblSortAs, 0, wxALL, 5 );
 	
 	cmbSortAs = new wxComboBox( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	fgSizer6->Add( cmbSortAs, 1, wxALL, 5 );
+	szrGeneral->Add( cmbSortAs, 1, wxALL, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
 	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkOrganisation->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkOrganisation, 1, wxEXPAND | wxALL, 5 );
@@ -4612,7 +4511,6 @@ frmContactEditorOrganisationsADT::frmContactEditorOrganisationsADT( wxWindow* pa
 	
 	// Connect Events
 	txtOrganisation->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmContactEditorOrganisationsADT::UpdateSortAs ), NULL, this );
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::CloseWindow ), NULL, this );
 }
@@ -4621,7 +4519,6 @@ frmContactEditorOrganisationsADT::~frmContactEditorOrganisationsADT()
 {
 	// Disconnect Events
 	txtOrganisation->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmContactEditorOrganisationsADT::UpdateSortAs ), NULL, this );
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::CloseWindow ), NULL, this );
 	
@@ -4640,74 +4537,23 @@ frmContactEditorNotesADT::frmContactEditorNotesADT( wxWindow* parent, wxWindowID
 	bSizer353 = new wxBoxSizer( wxVERTICAL );
 	
 	txtNote = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	txtNote->SetMaxLength( 0 ); 
 	bSizer353->Add( txtNote, 1, wxALL|wxEXPAND, 5 );
 	
 	
 	tabGeneral->SetSizer( bSizer353 );
 	tabGeneral->Layout();
 	bSizer353->Fit( tabGeneral );
-	nbkNotes->AddPage( tabGeneral, wxT("General"), true );
+	nbkNotes->AddPage( tabGeneral, wxT("General"), false );
 	tabPriority = new wxPanel( nbkNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer61;
-	fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer61->AddGrowableCol( 1 );
-	fgSizer61->SetFlexibleDirection( wxVERTICAL );
-	fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	lblPriority = new wxStaticText( tabPriority, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblPriority->Wrap( -1 );
-	fgSizer61->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer2601;
-	bSizer2601 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabPriority, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer2601->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer2541;
-	bSizer2541 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer2561;
-	bSizer2561 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabPriority, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer2561->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer2541->Add( bSizer2561, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer2551;
-	bSizer2551 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabPriority, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer2551->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
+	szrPriority = new wxFlexGridSizer( 1, 1, 0, 0 );
+	szrPriority->SetFlexibleDirection( wxBOTH );
+	szrPriority->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	bSizer2551->Add( 0, 0, 1, wxEXPAND, 5 );
 	
-	lblLow = new wxStaticText( tabPriority, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer2551->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer2541->Add( bSizer2551, 1, wxEXPAND, 0 );
-	
-	
-	bSizer2601->Add( bSizer2541, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer61->Add( bSizer2601, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer61->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabPriority->SetSizer( fgSizer61 );
+	tabPriority->SetSizer( szrPriority );
 	tabPriority->Layout();
-	fgSizer61->Fit( tabPriority );
-	nbkNotes->AddPage( tabPriority, wxT("Priority"), false );
+	szrPriority->Fit( tabPriority );
+	nbkNotes->AddPage( tabPriority, wxT("Priority"), true );
 	tabLanguage = new wxPanel( nbkNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer611;
 	fgSizer611 = new wxFlexGridSizer( 0, 2, 0, 0 );
@@ -4749,7 +4595,6 @@ frmContactEditorNotesADT::frmContactEditorNotesADT( wxWindow* parent, wxWindowID
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::CloseWindow ), NULL, this );
 }
@@ -4757,7 +4602,6 @@ frmContactEditorNotesADT::frmContactEditorNotesADT( wxWindow* parent, wxWindowID
 frmContactEditorNotesADT::~frmContactEditorNotesADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::CloseWindow ), NULL, this );
 	
@@ -4772,96 +4616,49 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow
 	
 	nbkTitles = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkTitles, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblTitle = new wxStaticText( tabGeneral, wxID_ANY, wxT("Title:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblTitle->Wrap( -1 );
-	fgSizer6->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblTitle, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtTitle = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtTitle->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtTitle, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtTitle, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
 	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
+	tabGeneral->SetSizer( szrGeneral );
+	tabGeneral->Layout();
+	szrGeneral->Fit( tabGeneral );
+	nbkTitles->AddPage( tabGeneral, wxT("General"), false );
 	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
+	bSizer251->Add( nbkTitles, 1, wxEXPAND | wxALL, 5 );
 	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
+	wxBoxSizer* bSizer252;
+	bSizer252 = new wxBoxSizer( wxHORIZONTAL );
 	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
+	btnAction = new wxButton( this, wxID_ANY, wxT("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer252->Add( btnAction, 0, wxALL, 5 );
 	
+	btnClose = new wxButton( this, wxID_ANY, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer252->Add( btnClose, 0, wxALL, 5 );
 	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
 	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
+	bSizer251->Add( bSizer252, 0, wxALIGN_RIGHT, 5 );
 	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
 	
+	this->SetSizer( bSizer251 );
+	this->Layout();
 	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabGeneral->SetSizer( fgSizer6 );
-	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
-	nbkTitles->AddPage( tabGeneral, wxT("General"), false );
-	
-	bSizer251->Add( nbkTitles, 1, wxEXPAND | wxALL, 5 );
-	
-	wxBoxSizer* bSizer252;
-	bSizer252 = new wxBoxSizer( wxHORIZONTAL );
-	
-	btnAction = new wxButton( this, wxID_ANY, wxT("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer252->Add( btnAction, 0, wxALL, 5 );
-	
-	btnClose = new wxButton( this, wxID_ANY, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer252->Add( btnClose, 0, wxALL, 5 );
-	
-	
-	bSizer251->Add( bSizer252, 0, wxALIGN_RIGHT, 5 );
-	
-	
-	this->SetSizer( bSizer251 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
+	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::CloseWindow ), NULL, this );
 }
@@ -4869,7 +4666,6 @@ frmContactEditorTitlesADT::frmContactEditorTitlesADT( wxWindow* parent, wxWindow
 frmContactEditorTitlesADT::~frmContactEditorTitlesADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorTitlesADT::CloseWindow ), NULL, this );
 	
@@ -4884,79 +4680,33 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind
 	
 	nbkRelated = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkRelated, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 0 );
-	fgSizer6->SetFlexibleDirection( wxBOTH );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblRelation = new wxStaticText( tabGeneral, wxID_ANY, wxT("Relation Name:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblRelation->Wrap( -1 );
-	fgSizer6->Add( lblRelation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblRelation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtRelated = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtRelated->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtRelated, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtRelated, 0, wxALL|wxEXPAND, 5 );
 	
 	lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblType->Wrap( -1 );
-	fgSizer6->Add( lblType, 0, wxALL, 5 );
+	szrGeneral->Add( lblType, 0, wxALL, 5 );
 	
 	cmbType = new wxComboBox( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	fgSizer6->Add( cmbType, 0, wxALL, 5 );
+	szrGeneral->Add( cmbType, 0, wxALL, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
 	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkRelated->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkRelated, 1, wxEXPAND | wxALL, 5 );
@@ -4980,7 +4730,6 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::ProcessData ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::CloseWindow ), NULL, this );
 }
@@ -4988,7 +4737,6 @@ frmContactEditorRelatedADT::frmContactEditorRelatedADT( wxWindow* parent, wxWind
 frmContactEditorRelatedADT::~frmContactEditorRelatedADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::ProcessData ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorRelatedADT::CloseWindow ), NULL, this );
 	
@@ -5003,80 +4751,35 @@ frmContactEditorSoundADT::frmContactEditorSoundADT( wxWindow* parent, wxWindowID
 	
 	nbkRelated = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkRelated, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxBOTH );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblSoundFile = new wxStaticText( tabGeneral, wxID_ANY, wxT("Sound File:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblSoundFile->Wrap( -1 );
-	fgSizer6->Add( lblSoundFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblSoundFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	fipSound = new wxFilePickerCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxT("Select a sound file"), wxT("*.*"), wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE );
-	fgSizer6->Add( fipSound, 1, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( fipSound, 1, wxALL|wxEXPAND, 5 );
 	
 	lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblType->Wrap( -1 );
-	fgSizer6->Add( lblType, 0, wxALL, 5 );
+	szrGeneral->Add( lblType, 0, wxALL, 5 );
 	
 	wxArrayString cmbTypeChoices;
 	cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 );
 	cmbType->SetSelection( 0 );
-	fgSizer6->Add( cmbType, 0, wxALL, 5 );
+	szrGeneral->Add( cmbType, 0, wxALL, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
 	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkRelated->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkRelated, 1, wxEXPAND | wxALL, 5 );
@@ -5100,7 +4803,6 @@ frmContactEditorSoundADT::frmContactEditorSoundADT( wxWindow* parent, wxWindowID
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::ProcessData ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::CloseWindow ), NULL, this );
 }
@@ -5108,7 +4810,6 @@ frmContactEditorSoundADT::frmContactEditorSoundADT( wxWindow* parent, wxWindowID
 frmContactEditorSoundADT::~frmContactEditorSoundADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::ProcessData ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorSoundADT::CloseWindow ), NULL, this );
 	
@@ -5123,80 +4824,35 @@ frmContactEditorPictureADT::frmContactEditorPictureADT( wxWindow* parent, wxWind
 	
 	nbkRelated = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkRelated, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxBOTH );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblPictureFile = new wxStaticText( tabGeneral, wxID_ANY, wxT("Picture File:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPictureFile->Wrap( -1 );
-	fgSizer6->Add( lblPictureFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblPictureFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	fipPicture = new wxFilePickerCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxT("Select a sound file"), wxT("*.*"), wxDefaultPosition, wxDefaultSize, wxFLP_DEFAULT_STYLE );
-	fgSizer6->Add( fipPicture, 1, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( fipPicture, 1, wxALL|wxEXPAND, 5 );
 	
 	lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblType->Wrap( -1 );
-	fgSizer6->Add( lblType, 0, wxALL, 5 );
+	szrGeneral->Add( lblType, 0, wxALL, 5 );
 	
 	wxArrayString cmbTypeChoices;
 	cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 );
 	cmbType->SetSelection( 0 );
-	fgSizer6->Add( cmbType, 0, wxALL, 5 );
+	szrGeneral->Add( cmbType, 0, wxALL, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
 	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkRelated->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkRelated, 1, wxEXPAND | wxALL, 5 );
@@ -5220,7 +4876,6 @@ frmContactEditorPictureADT::frmContactEditorPictureADT( wxWindow* parent, wxWind
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::ProcessData ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::CloseWindow ), NULL, this );
 }
@@ -5228,7 +4883,6 @@ frmContactEditorPictureADT::frmContactEditorPictureADT( wxWindow* parent, wxWind
 frmContactEditorPictureADT::~frmContactEditorPictureADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::ProcessData ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorPictureADT::CloseWindow ), NULL, this );
 	
@@ -5243,72 +4897,26 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi
 	
 	nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblWebsite = new wxStaticText( tabGeneral, wxID_ANY, wxT("Website:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblWebsite->Wrap( -1 );
-	fgSizer6->Add( lblWebsite, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblWebsite, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtWebsite = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtWebsite->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtWebsite, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtWebsite, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
 	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkWebsite->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 );
@@ -5332,7 +4940,6 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::CloseWindow ), NULL, this );
 }
@@ -5340,7 +4947,6 @@ frmContactEditorWebsitesADT::frmContactEditorWebsitesADT( wxWindow* parent, wxWi
 frmContactEditorWebsitesADT::~frmContactEditorWebsitesADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorWebsitesADT::CloseWindow ), NULL, this );
 	
@@ -5355,72 +4961,26 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent
 	
 	nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 2, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblGeoposition = new wxStaticText( tabGeneral, wxID_ANY, wxT("Geoposition:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblGeoposition->Wrap( -1 );
-	fgSizer6->Add( lblGeoposition, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblGeoposition, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtGeoposition = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtGeoposition->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtGeoposition, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtGeoposition, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
 	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkWebsite->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 );
@@ -5444,7 +5004,6 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::CloseWindow ), NULL, this );
 }
@@ -5452,7 +5011,6 @@ frmContactEditorGeopositionADT::frmContactEditorGeopositionADT( wxWindow* parent
 frmContactEditorGeopositionADT::~frmContactEditorGeopositionADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorGeopositionADT::CloseWindow ), NULL, this );
 	
@@ -5467,81 +5025,35 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow
 	
 	nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer6->AddGrowableCol( 1 );
-	fgSizer6->SetFlexibleDirection( wxVERTICAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+	szrGeneral->AddGrowableCol( 1 );
+	szrGeneral->SetFlexibleDirection( wxBOTH );
+	szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	lblAddress = new wxStaticText( tabGeneral, wxID_ANY, wxT("Address:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblAddress->Wrap( -1 );
-	fgSizer6->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	szrGeneral->Add( lblAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtAddress = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtAddress->SetMaxLength( 0 ); 
-	fgSizer6->Add( txtAddress, 0, wxALL|wxEXPAND, 5 );
+	szrGeneral->Add( txtAddress, 0, wxALL|wxEXPAND, 5 );
 	
 	lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblType->Wrap( -1 );
-	fgSizer6->Add( lblType, 0, wxALL, 5 );
+	szrGeneral->Add( lblType, 0, wxALL, 5 );
 	
 	wxArrayString cmbTypeChoices;
 	cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 );
 	cmbType->SetSelection( 0 );
-	fgSizer6->Add( cmbType, 0, wxALL, 5 );
+	szrGeneral->Add( cmbType, 0, wxALL, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPriority->Wrap( -1 );
-	fgSizer6->Add( lblPriority, 0, wxALL, 5 );
+	szrGeneral->Add( lblPriority, 0, wxALL, 5 );
 	
-	wxBoxSizer* bSizer260;
-	bSizer260 = new wxBoxSizer( wxHORIZONTAL );
 	
-	chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer254;
-	bSizer254 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer256;
-	bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
-	bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer255;
-	bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-	
-	lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblHigh->Wrap( -1 );
-	bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-	
-	
-	bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
-	lblLow->Wrap( -1 );
-	bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-	
-	
-	bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-	
-	
-	bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-	
-	
-	fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	tabGeneral->SetSizer( fgSizer6 );
+	tabGeneral->SetSizer( szrGeneral );
 	tabGeneral->Layout();
-	fgSizer6->Fit( tabGeneral );
+	szrGeneral->Fit( tabGeneral );
 	nbkWebsite->AddPage( tabGeneral, wxT("General"), false );
 	
 	bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 );
@@ -5565,7 +5077,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow
 	this->Centre( wxBOTH );
 	
 	// Connect Events
-	chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::EnablePriority ), NULL, this );
 	btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::ProcessAction ), NULL, this );
 	btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::CloseWindow ), NULL, this );
 }
@@ -5573,7 +5084,6 @@ frmContactEditorCalAdrADT::frmContactEditorCalAdrADT( wxWindow* parent, wxWindow
 frmContactEditorCalAdrADT::~frmContactEditorCalAdrADT()
 {
 	// Disconnect Events
-	chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::EnablePriority ), NULL, this );
 	btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::ProcessAction ), NULL, this );
 	btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorCalAdrADT::CloseWindow ), NULL, this );
 	
@@ -5599,7 +5109,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow
 	fgSizer6->Add( lblVendorPEN, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtPEN = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtPEN->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtPEN, 0, wxALL, 5 );
 	
 	lblElement = new wxStaticText( tabGeneral, wxID_ANY, wxT("Element:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -5607,7 +5116,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow
 	fgSizer6->Add( lblElement, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtElement = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtElement->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtElement, 0, wxALL|wxEXPAND, 5 );
 	
 	lblValue = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -5615,7 +5123,6 @@ frmContactEditorVendorADT::frmContactEditorVendorADT( wxWindow* parent, wxWindow
 	fgSizer6->Add( lblValue, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtValue = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtValue->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtValue, 0, wxALL|wxEXPAND, 5 );
 	
 	
@@ -5677,7 +5184,6 @@ frmContactEditorXTokenADT::frmContactEditorXTokenADT( wxWindow* parent, wxWindow
 	fgSizer6->Add( lblTokenName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtTokenName = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtTokenName->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtTokenName, 0, wxALL, 5 );
 	
 	lblXT = new wxStaticText( tabGeneral, wxID_ANY, wxT("Value:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -5685,7 +5191,6 @@ frmContactEditorXTokenADT::frmContactEditorXTokenADT( wxWindow* parent, wxWindow
 	fgSizer6->Add( lblXT, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtValue = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtValue->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtValue, 0, wxALL|wxEXPAND, 5 );
 	
 	
@@ -5812,7 +5317,7 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id,
 	tabGeneral->SetSizer( fgSizer6 );
 	tabGeneral->Layout();
 	fgSizer6->Fit( tabGeneral );
-	nbkWebsite->AddPage( tabGeneral, wxT("General"), true );
+	nbkWebsite->AddPage( tabGeneral, wxT("General"), false );
 	tabURL = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxFlexGridSizer* fgSizer61;
 	fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 );
@@ -5832,7 +5337,6 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id,
 	fgSizer61->Add( lblAddress, 0, wxALL, 5 );
 	
 	txtAddress = new wxTextCtrl( tabURL, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtAddress->SetMaxLength( 0 ); 
 	fgSizer61->Add( txtAddress, 1, wxALL|wxEXPAND, 5 );
 	
 	
@@ -5863,14 +5367,13 @@ frmContactEditorKeyADT::frmContactEditorKeyADT( wxWindow* parent, wxWindowID id,
 	fgSizer62->Add( lblKeyData, 0, wxALL, 5 );
 	
 	txtKeyData = new wxTextCtrl( tabKey, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );
-	txtKeyData->SetMaxLength( 0 ); 
 	fgSizer62->Add( txtKeyData, 1, wxALL|wxEXPAND, 5 );
 	
 	
 	tabKey->SetSizer( fgSizer62 );
 	tabKey->Layout();
 	fgSizer62->Fit( tabKey );
-	nbkWebsite->AddPage( tabKey, wxT("Key"), false );
+	nbkWebsite->AddPage( tabKey, wxT("Key"), true );
 	
 	bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 );
 	
@@ -5933,7 +5436,6 @@ frmContactEditorEmailADT::frmContactEditorEmailADT( wxWindow* parent, wxWindowID
 	fgSizer6->Add( lblEmailAddress, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtEmail = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtEmail->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtEmail, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6052,7 +5554,6 @@ frmContactEditorIMADT::frmContactEditorIMADT( wxWindow* parent, wxWindowID id, c
 	fgSizer6->Add( lblUsername, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtUsername = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtUsername->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtUsername, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6164,7 +5665,6 @@ frmContactEditorCategoryADT::frmContactEditorCategoryADT( wxWindow* parent, wxWi
 	fgSizer6->Add( lblCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtCategory = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtCategory->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtCategory, 0, wxALL|wxEXPAND, 5 );
 	
 	lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6285,7 +5785,6 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
 	fgSizer6->Add( lblTelephone, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtTelephone = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtTelephone->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtTelephone, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6338,7 +5837,7 @@ frmContactEditorTelephoneADT::frmContactEditorTelephoneADT( wxWindow* parent, wx
 	fgSizer6->Add( lblTelephoneType, 0, wxALIGN_TOP|wxALL, 5 );
 	
 	wxGridSizer* gSizer5;
-	gSizer5 = new wxGridSizer( 2, 2, 0, 0 );
+	gSizer5 = new wxGridSizer( 0, 2, 0, 0 );
 	
 	chkVoice = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Voice"), wxDefaultPosition, wxDefaultSize, 0 );
 	gSizer5->Add( chkVoice, 0, wxALL, 2 );
@@ -6425,7 +5924,6 @@ frmContactEditorLanguagesADT::frmContactEditorLanguagesADT( wxWindow* parent, wx
 	fgSizer6->Add( lblLanguage, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtLanguage = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtLanguage->SetMaxLength( 0 ); 
 	fgSizer6->Add( txtLanguage, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6650,7 +6148,6 @@ XABSearchPanelADT::XABSearchPanelADT( wxWindow* parent, wxWindowID id, const wxP
 	szrSSet->Add( chkActive, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtSearch = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtSearch->SetMaxLength( 0 ); 
 	szrSSet->Add( txtSearch, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	
@@ -6764,7 +6261,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS
 	fgSizer43->Add( lblAccName, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtAccountName = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtAccountName->SetMaxLength( 0 ); 
 	fgSizer43->Add( txtAccountName, 1, wxALL|wxEXPAND, 5 );
 	
 	lblAccAdr = new wxStaticText( tabProperties, wxID_ANY, wxT("Address:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6772,7 +6268,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS
 	fgSizer43->Add( lblAccAdr, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtAddress = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtAddress->SetMaxLength( 0 ); 
 	fgSizer43->Add( txtAddress, 0, wxALL|wxEXPAND, 5 );
 	
 	m_staticText193 = new wxStaticText( tabProperties, wxID_ANY, wxT("Port:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6780,7 +6275,14 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS
 	fgSizer43->Add( m_staticText193, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtPort = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtPort->SetMaxLength( 5 ); 
+	#ifdef __WXGTK__
+	if ( !txtPort->HasFlag( wxTE_MULTILINE ) )
+	{
+	txtPort->SetMaxLength( 5 );
+	}
+	#else
+	txtPort->SetMaxLength( 5 );
+	#endif
 	fgSizer43->Add( txtPort, 0, wxALL, 5 );
 	
 	lblPort = new wxStaticText( tabProperties, wxID_ANY, wxT("Username:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6788,15 +6290,13 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS
 	fgSizer43->Add( lblPort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtUsername = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtUsername->SetMaxLength( 0 ); 
 	fgSizer43->Add( txtUsername, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPassword = new wxStaticText( tabProperties, wxID_ANY, wxT("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblPassword->Wrap( -1 );
 	fgSizer43->Add( lblPassword, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	txtPassword = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtPassword->SetMaxLength( 0 ); 
+	txtPassword = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
 	fgSizer43->Add( txtPassword, 0, wxALL|wxEXPAND, 5 );
 	
 	lblPrefix = new wxStaticText( tabProperties, wxID_ANY, wxT("Prefix:"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -6807,7 +6307,6 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS
 	bSizer391 = new wxBoxSizer( wxHORIZONTAL );
 	
 	txtPrefix = new wxTextCtrl( tabProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtPrefix->SetMaxLength( 0 ); 
 	bSizer391->Add( txtPrefix, 1, wxALL|wxEXPAND, 5 );
 	
 	btnDetect = new wxButton( tabProperties, wxID_ANY, wxT("Detect"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
@@ -6840,7 +6339,14 @@ frmEditAccountADT::frmEditAccountADT( wxWindow* parent, wxWindowID id, const wxS
 	fgSizer431->Add( lblRefresh, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	txtRefresh = new wxTextCtrl( tabRefresh, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	txtRefresh->SetMaxLength( 5 ); 
+	#ifdef __WXGTK__
+	if ( !txtRefresh->HasFlag( wxTE_MULTILINE ) )
+	{
+	txtRefresh->SetMaxLength( 5 );
+	}
+	#else
+	txtRefresh->SetMaxLength( 5 );
+	#endif
 	fgSizer431->Add( txtRefresh, 1, wxALL, 5 );
 	
 	
@@ -6917,7 +6423,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con
 	
 	lblCertName = new wxStaticText( pnlTop, wxID_ANY, wxT("Certificate Name"), wxDefaultPosition, wxDefaultSize, 0 );
 	lblCertName->Wrap( -1 );
-	lblCertName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+	lblCertName->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, wxEmptyString ) );
 	
 	bSizer389->Add( lblCertName, 0, wxALL, 5 );
 	
@@ -6978,7 +6484,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con
 	tabSummary->SetSizer( bSizer386 );
 	tabSummary->Layout();
 	bSizer386->Fit( tabSummary );
-	m_notebook28->AddPage( tabSummary, wxT("Summary"), false );
+	m_notebook28->AddPage( tabSummary, wxT("Summary"), true );
 	tabDetail = new wxPanel( m_notebook28, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
 	wxBoxSizer* bSizer3891;
 	bSizer3891 = new wxBoxSizer( wxVERTICAL );
@@ -6987,7 +6493,6 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con
 	bSizer3891->Add( lstValues, 1, wxALL|wxEXPAND, 5 );
 	
 	txtValueData = new wxTextCtrl( tabDetail, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_READONLY );
-	txtValueData->SetMaxLength( 0 ); 
 	txtValueData->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
 	
 	bSizer3891->Add( txtValueData, 1, wxALL|wxEXPAND, 5 );
@@ -7021,7 +6526,7 @@ frmSSLCertificateADT::frmSSLCertificateADT( wxWindow* parent, wxWindowID id, con
 	tabHierarchy->SetSizer( bSizer390 );
 	tabHierarchy->Layout();
 	bSizer390->Fit( tabHierarchy );
-	m_notebook28->AddPage( tabHierarchy, wxT("Hierarchy"), true );
+	m_notebook28->AddPage( tabHierarchy, wxT("Hierarchy"), false );
 	
 	bSizer384->Add( m_notebook28, 1, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
 	
@@ -7112,13 +6617,13 @@ frmInvalidSSLCertificateADT::~frmInvalidSSLCertificateADT()
 
 frmImportContactsADT::frmImportContactsADT( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	this->SetSizeHints( wxSize( 325,400 ), wxSize( 325,400 ) );
 	
 	wxBoxSizer* bSizer393;
 	bSizer393 = new wxBoxSizer( wxVERTICAL );
 	
 	lblImportText = new wxStaticText( this, wxID_ANY, wxT("Select the contacts you want to import and the account to import into. Click on Import to finish."), wxDefaultPosition, wxDefaultSize, 0 );
-	lblImportText->Wrap( -1 );
+	lblImportText->Wrap( 300 );
 	bSizer393->Add( lblImportText, 0, wxALL|wxEXPAND, 5 );
 	
 	wxArrayString lstContactsChoices;
@@ -7178,13 +6683,14 @@ frmImportResultsADT::frmImportResultsADT( wxWindow* parent, wxWindowID id, const
 	bSizer396->Add( lblText, 0, wxALL, 5 );
 	
 	txtResults = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	txtResults->SetMaxLength( 0 ); 
 	bSizer396->Add( txtResults, 1, wxALL|wxEXPAND, 5 );
 	
 	wxBoxSizer* bSizer397;
 	bSizer397 = new wxBoxSizer( wxHORIZONTAL );
 	
 	btnCopyClipboard = new wxButton( this, wxID_ANY, wxT("Copy to Clipboard"), wxDefaultPosition, wxDefaultSize, 0 );
+	btnCopyClipboard->Hide();
+	
 	bSizer397->Add( btnCopyClipboard, 0, 0, 5 );
 	
 	btnFinish = new wxButton( this, wxID_ANY, wxT("Finish"), wxDefaultPosition, wxDefaultSize, 0 );