diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index d03daa3..75d1cda 100644
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -2689,7 +2689,9 @@ void DoCommandListDlg(){
 	int loop = 1, ret = IDCANCEL;
 
 	dlg = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-	gtk_window_set_title( GTK_WINDOW( dlg ), _( "Mapped Commands" ) );
+    gtk_window_set_transient_for( GTK_WINDOW( dlg ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
+	gtk_window_set_position( GTK_WINDOW( dlg ), GTK_WIN_POS_CENTER_ON_PARENT );
+	gtk_window_set_title( GTK_WINDOW( dlg ), _( "Shortcut List" ) );
 	gtk_signal_connect( GTK_OBJECT( dlg ), "delete_event",
 						GTK_SIGNAL_FUNC( dialog_delete_callback ), NULL );
 	gtk_signal_connect( GTK_OBJECT( dlg ), "destroy",
diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index ddf8151..43a510e 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -1561,7 +1561,7 @@ void MainFrame::create_main_menu( GtkWidget *window, GtkWidget *vbox ){
 		menu_tearoff( menu );
 	}
 
-	item = create_menu_item_with_mnemonic( menu, _( "Manual" ),
+	item = create_menu_item_with_mnemonic( menu, _( "GtkRadiant Manual" ),
 										   GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP );
 	gtk_widget_add_accelerator( item, "activate", accel, GDK_F1, (GdkModifierType)0, GTK_ACCEL_VISIBLE );
 
@@ -1572,11 +1572,11 @@ void MainFrame::create_main_menu( GtkWidget *window, GtkWidget *vbox ){
 	// TTimo: this is in global.xlink now
 	//create_menu_item_with_mnemonic (menu, "Links",
 	//                  GTK_SIGNAL_FUNC (HandleCommand), ID_HELP_LINKS);
-	create_menu_item_with_mnemonic( menu, _( "Bug report" ),
+	create_menu_item_with_mnemonic( menu, _( "Report a Bug" ),
 									GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP_BUGREPORT );
-	create_menu_item_with_mnemonic( menu, _( "Shortcuts list" ),
+	create_menu_item_with_mnemonic( menu, _( "View Shortcuts" ),
 									GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP_COMMANDLIST );
-	create_menu_item_with_mnemonic( menu, _( "_About" ),
+	create_menu_item_with_mnemonic( menu, _( "_About GtkRadiant" ),
 									GTK_SIGNAL_FUNC( HandleCommand ), ID_HELP_ABOUT );
 
 
@@ -6476,11 +6476,7 @@ void MainFrame::OnPluginsRefresh(){
 
 // open the Q3Rad manual
 void MainFrame::OnHelp(){
-	// at least on win32, g_strGameToolsPath + "Q3Rad_Manual/index.htm"
-	Str help;
-	help = g_strAppPath;
-	help += "Q3Rad_Manual/index.htm";
-	OpenURL( help.GetBuffer() );
+	OpenURL( "http://icculus.org/gtkradiant/documentation/q3radiant_manual/index.htm" );
 }
 
 // FIXME: we'll go towards a unified help thing soon
@@ -6492,7 +6488,7 @@ void MainFrame::OnHelpLinks(){
 }
 
 void MainFrame::OnHelpBugreport(){
-	OpenURL( "http://www.qeradiant.com/faq/fom-serve/cache/138.html" );
+	OpenURL( "https://github.com/TTimo/GtkRadiant/issues" );
 }
 
 void MainFrame::OnHelpCommandlist(){
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index c302134..d9cff7d 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -1526,6 +1526,8 @@ void PrefsDlg::BuildDialog(){
 
 	dialog = m_pWidget;
 	gtk_window_set_title( GTK_WINDOW( dialog ), _( "GtkRadiant Preferences" ) );
+    gtk_window_set_transient_for( GTK_WINDOW( dialog ), GTK_WINDOW( g_pParentWnd->m_pWidget ) );
+	gtk_window_set_position( GTK_WINDOW( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
 	gtk_widget_realize( dialog );
 
 	mainvbox = gtk_vbox_new( FALSE, 5 );