diff --git a/gnoemoe/gm-ui.h b/gnoemoe/gm-ui.h
index 4d17b9e..a4d865a 100644
--- a/gnoemoe/gm-ui.h
+++ b/gnoemoe/gm-ui.h
@@ -16,7 +16,6 @@ static const GtkActionEntry gm_sensitive_menu_entries[] =
 	/* Toplevel */
 	{"World", NULL, N_("_World")},
 	{"Edit", NULL, N_("_Edit")},
-	{"View", NULL, N_("_View")},
 	{"Help", NULL, N_("_Help")},
 
 	/* World menu */
@@ -31,12 +30,8 @@ static const GtkActionEntry gm_sensitive_menu_entries[] =
 	{"EditPreferences", GTK_STOCK_PREFERENCES, NULL, NULL,
 			N_("Configure the application"), 
 			G_CALLBACK(on_gm_app_view_edit_preferences)},
-	
-	/* View menu */
-	{"ViewMcp", NULL, N_("MCP"), NULL,
-			N_("View MCP console"), G_CALLBACK(on_gm_app_view_view_mcp)},
-	{"ViewScripts", NULL, N_("Scripts"), NULL,
-			N_("View scripts"), G_CALLBACK(on_gm_app_view_view_scripts)},
+	{"EditScripts", NULL, N_("Scripts"), NULL,
+			N_("Edit scripts"), G_CALLBACK(on_gm_app_view_edit_scripts)},
 
 	/* Help menu */
 	{"HelpAbout", GTK_STOCK_ABOUT, NULL, NULL,
@@ -68,10 +63,13 @@ static const GtkActionEntry gm_menu_entries[] =
 			N_("Edit the current world"), 
 			G_CALLBACK(on_gm_app_view_edit_world)},
 	{"EditFind", GTK_STOCK_FIND, NULL, "<control>F",
-			N_("Find text"), G_CALLBACK(on_gm_app_view_edit_find)},
-	{"EditFindNext", GTK_STOCK_FIND, N_("Find next"), "<control>G",
+			N_("_Find..."), G_CALLBACK(on_gm_app_view_edit_find)},
+	{"EditFindNext", GTK_STOCK_FIND, N_("Find Ne_xt"), "<control>G",
 			N_("Find next occurence"), 
 			G_CALLBACK(on_gm_app_view_edit_find_next)},
+	{"EditReplace", GTK_STOCK_FIND_AND_REPLACE, N_("_Replace..."), "<control>R",
+			N_("Search for and replace text"), 
+			G_CALLBACK(on_gm_app_view_edit_replace)}
 };
 
 G_END_DECLS