diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/client/gui-gtk/menu.c menuciv/client/gui-gtk/menu.c
--- freeciv/client/gui-gtk/menu.c	Thu Apr 19 00:27:11 2001
+++ menuciv/client/gui-gtk/menu.c	Thu Apr 19 00:08:04 2001
@@ -67,8 +67,6 @@
   MENU_GAME_OPTIONS,
   MENU_GAME_MSG_OPTIONS,
   MENU_GAME_SAVE_SETTINGS,
-  MENU_GAME_PLAYERS,
-  MENU_GAME_MESSAGES,
   MENU_GAME_SERVER_OPTIONS1,
   MENU_GAME_SERVER_OPTIONS2,
   MENU_GAME_OUTPUT_LOG,
@@ -126,10 +124,12 @@
 
   MENU_REPORT_CITIES,
   MENU_REPORT_UNITS,
+  MENU_REPORT_PLAYERS,
   MENU_REPORT_ECONOMY,
   MENU_REPORT_SCIENCE,
   MENU_REPORT_WOW,
   MENU_REPORT_TOP_CITIES,
+  MENU_REPORT_MESSAGES,
   MENU_REPORT_DEMOGRAPHIC,
   MENU_REPORT_SPACESHIP,
 
@@ -169,12 +169,6 @@
   case MENU_GAME_SAVE_SETTINGS:
     save_options();
     break;
-  case MENU_GAME_PLAYERS:
-    popup_players_dialog();
-    break;
-  case MENU_GAME_MESSAGES:
-    popup_meswin_dialog();
-    break;
   case MENU_GAME_SERVER_OPTIONS1:
     send_report_request(REPORT_SERVER_OPTIONS1);
     break;
@@ -421,6 +415,9 @@
    case MENU_REPORT_UNITS:
     popup_activeunits_report_dialog(0);
     break;
+  case MENU_REPORT_PLAYERS:
+    popup_players_dialog();
+    break;
    case MENU_REPORT_ECONOMY:
     popup_economy_report_dialog(0);
     break;
@@ -433,6 +430,9 @@
    case MENU_REPORT_TOP_CITIES:
     send_report_request(REPORT_TOP_5_CITIES);
     break;
+  case MENU_REPORT_MESSAGES:
+    popup_meswin_dialog();
+    break;
    case MENU_REPORT_DEMOGRAPHIC:
     send_report_request(REPORT_DEMOGRAPHIC);
     break;
@@ -548,23 +548,17 @@
 	game_menu_callback,	MENU_GAME_SAVE_SETTINGS					},
   { "/" N_("Game") "/sep2",				NULL,
 	NULL,			0,					"<Separator>"	},
-  { "/" N_("Game") "/" N_("_Players"),			"F3",
-	game_menu_callback,	MENU_GAME_PLAYERS					},
-  { "/" N_("Game") "/" N_("_Messages"),			"F10",
-	game_menu_callback,	MENU_GAME_MESSAGES					},
-  { "/" N_("Game") "/sep3",				NULL,
-	NULL,			0,					"<Separator>"	},
   { "/" N_("Game") "/" N_("Server Opt _initial"),	NULL,
 	game_menu_callback,	MENU_GAME_SERVER_OPTIONS1				},
   { "/" N_("Game") "/" N_("Server Opt _ongoing"),	NULL,
 	game_menu_callback,	MENU_GAME_SERVER_OPTIONS2				},
-  { "/" N_("Game") "/sep4",				NULL,
+  { "/" N_("Game") "/sep3",				NULL,
 	NULL,			0,					"<Separator>"	},
   { "/" N_("Game") "/" N_("_Export Log"),		NULL,
 	game_menu_callback,	MENU_GAME_OUTPUT_LOG					},
   { "/" N_("Game") "/" N_("_Clear Log"),		NULL,
 	game_menu_callback,	MENU_GAME_CLEAR_OUTPUT					},
-  { "/" N_("Game") "/sep5",				NULL,
+  { "/" N_("Game") "/sep4",				NULL,
 	NULL,			0,					"<Separator>"	},
   { "/" N_("Game") "/" N_("_Disconnect"),		NULL,
 	game_menu_callback,	MENU_GAME_DISCONNECT					},
@@ -706,6 +700,8 @@
 	reports_menu_callback,	MENU_REPORT_CITIES					},
   { "/" N_("Reports") "/" N_("_Units"),			"F2",
 	reports_menu_callback,	MENU_REPORT_UNITS					},
+  { "/" N_("Reports") "/" N_("_Players"),		"F3",
+	reports_menu_callback,	MENU_REPORT_PLAYERS					},
   { "/" N_("Reports") "/" N_("_Economy"),		"F5",
 	reports_menu_callback,	MENU_REPORT_ECONOMY					},
   { "/" N_("Reports") "/" N_("_Science"),		"F6",
@@ -716,6 +712,8 @@
 	reports_menu_callback,	MENU_REPORT_WOW						},
   { "/" N_("Reports") "/" N_("_Top Five Cities"),	"F8",
 	reports_menu_callback,	MENU_REPORT_TOP_CITIES					},
+  { "/" N_("Reports") "/" N_("_Messages"),		"F10",
+	reports_menu_callback,	MENU_REPORT_MESSAGES					},
   { "/" N_("Reports") "/" N_("_Demographics"),		"F11",
 	reports_menu_callback,	MENU_REPORT_DEMOGRAPHIC					},
   { "/" N_("Reports") "/" N_("S_paceship"),		"F12",
@@ -940,8 +938,6 @@
     menus_set_sensitive("<main>/Game/Local Options", FALSE);
     menus_set_sensitive("<main>/Game/Message Options", FALSE);
     menus_set_sensitive("<main>/Game/Save Settings", FALSE);
-    menus_set_sensitive("<main>/Game/Players", FALSE);
-    menus_set_sensitive("<main>/Game/Messages", FALSE);
     menus_set_sensitive("<main>/Game/Server Opt initial", TRUE);
     menus_set_sensitive("<main>/Game/Server Opt ongoing", TRUE);
     menus_set_sensitive("<main>/Game/Export Log", TRUE);
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/client/gui-xaw/actions.c menuciv/client/gui-xaw/actions.c
--- freeciv/client/gui-xaw/actions.c	Thu Apr 19 00:27:18 2001
+++ menuciv/client/gui-xaw/actions.c	Thu Apr 19 00:08:17 2001
@@ -225,14 +225,14 @@
 static void xaw_key_open_messages(Widget w, XEvent *event, String *argv, Cardinal *argc)
 {
   if(get_client_state()==CLIENT_GAME_RUNNING_STATE &&
-     is_menu_item_active(MENU_GAME, MENU_GAME_MESSAGES))
+     is_menu_item_active(MENU_REPORT, MENU_REPORT_MESSAGES))
     popup_meswin_dialog();
 }
 
 static void xaw_key_open_players(Widget w, XEvent *event, String *argv, Cardinal *argc)
 {
   if(get_client_state()==CLIENT_GAME_RUNNING_STATE &&
-     is_menu_item_active(MENU_GAME, MENU_GAME_PLAYERS))
+     is_menu_item_active(MENU_REPORT, MENU_REPORT_PLAYERS))
     popup_players_dialog();
 }
 
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/client/gui-xaw/menu.c menuciv/client/gui-xaw/menu.c
--- freeciv/client/gui-xaw/menu.c	Thu Apr 19 00:27:25 2001
+++ menuciv/client/gui-xaw/menu.c	Thu Apr 19 00:08:17 2001
@@ -105,9 +105,6 @@
     { { N_("Message Options"), 0      },      "", MENU_GAME_MSG_OPTIONS, 0 },
     { { N_("Save Settings"), 0        },      "", MENU_GAME_SAVE_SETTINGS, 0 },
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
-    { { N_("Players"), 0              },    "F3", MENU_GAME_PLAYERS, 0 },
-    { { N_("Messages"), 0             },   "F10", MENU_GAME_MESSAGES, 0 },
-    { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
     { { N_("Server Opt initial"), 0   },      "", MENU_GAME_SERVER_OPTIONS1, 0 },
     { { N_("Server Opt ongoing"), 0   },      "", MENU_GAME_SERVER_OPTIONS2, 0 },
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
@@ -199,11 +196,13 @@
 static struct MenuEntry reports_menu_entries[]={
     { { N_("Cities"), 0               },    "F1", MENU_REPORT_CITIES, 0 },
     { { N_("Units"), 0                },    "F2", MENU_REPORT_UNITS, 0 },
+    { { N_("Players"), 0              },    "F3", MENU_REPORT_PLAYERS, 0 },
     { { N_("Economy"), 0              },    "F5", MENU_REPORT_ECONOMY, 0 },
     { { N_("Science"), 0              },    "F6", MENU_REPORT_SCIENCE, 0 },
     { { 0                             },      "", MENU_SEPARATOR_LINE, 0 },
     { { N_("Wonders of the World"), 0 },    "F7", MENU_REPORT_WOW, 0 },
     { { N_("Top Five Cities"), 0      },    "F8", MENU_REPORT_TOP_CITIES, 0 },
+    { { N_("Messages"), 0             },   "F10", MENU_REPORT_MESSAGES, 0 },
     { { N_("Demographics"), 0         },   "F11", MENU_REPORT_DEMOGRAPHIC, 0 },
     { { N_("Spaceship"), 0            },   "F12", MENU_REPORT_SPACESHIP, 0 },
     { { 0,                            },       0, MENU_END_OF_LIST, 0 }
@@ -254,8 +253,6 @@
     menu_entry_sensitive(MENU_GAME, MENU_GAME_OPTIONS, 0);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_MSG_OPTIONS, 0);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_SAVE_SETTINGS, 0);
-    menu_entry_sensitive(MENU_GAME, MENU_GAME_PLAYERS, 0);
-    menu_entry_sensitive(MENU_GAME, MENU_GAME_MESSAGES, 0);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_SERVER_OPTIONS1, 1);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_SERVER_OPTIONS2, 1);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_OUTPUT_LOG, 1);
@@ -296,8 +293,6 @@
     menu_entry_sensitive(MENU_GAME, MENU_GAME_OPTIONS, 1);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_MSG_OPTIONS, 1);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_SAVE_SETTINGS, 1);
-    menu_entry_sensitive(MENU_GAME, MENU_GAME_PLAYERS, 1);
-    menu_entry_sensitive(MENU_GAME, MENU_GAME_MESSAGES, 1);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_SERVER_OPTIONS1, 1);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_SERVER_OPTIONS2, 1);
     menu_entry_sensitive(MENU_GAME, MENU_GAME_OUTPUT_LOG, 1);
@@ -451,12 +446,6 @@
   case MENU_GAME_SAVE_SETTINGS:
     save_options();
     break;
-  case MENU_GAME_PLAYERS:
-    popup_players_dialog();
-    break;
-  case MENU_GAME_MESSAGES:
-    popup_meswin_dialog();
-    break;
   case MENU_GAME_SERVER_OPTIONS1:
     send_report_request(REPORT_SERVER_OPTIONS1);
     break;
@@ -685,6 +674,9 @@
    case MENU_REPORT_UNITS:
     popup_activeunits_report_dialog(0);
     break;
+  case MENU_REPORT_PLAYERS:
+    popup_players_dialog();
+    break;
    case MENU_REPORT_ECONOMY:
     popup_economy_report_dialog(0);
     break;
@@ -696,6 +688,9 @@
     break;
    case MENU_REPORT_TOP_CITIES:
     send_report_request(REPORT_TOP_5_CITIES);
+    break;
+  case MENU_REPORT_MESSAGES:
+    popup_meswin_dialog();
     break;
    case MENU_REPORT_DEMOGRAPHIC:
     send_report_request(REPORT_DEMOGRAPHIC);
diff -Nur -X/mnt/data/freeciv-dev/freeciv/diff_ignore freeciv/client/gui-xaw/menu.h menuciv/client/gui-xaw/menu.h
--- freeciv/client/gui-xaw/menu.h	Thu Apr 19 00:27:30 2001
+++ menuciv/client/gui-xaw/menu.h	Thu Apr 19 00:08:17 2001
@@ -36,8 +36,6 @@
   MENU_GAME_OPTIONS,
   MENU_GAME_MSG_OPTIONS,
   MENU_GAME_SAVE_SETTINGS,
-  MENU_GAME_PLAYERS,
-  MENU_GAME_MESSAGES,
   MENU_GAME_SERVER_OPTIONS1,
   MENU_GAME_SERVER_OPTIONS2,
   MENU_GAME_OUTPUT_LOG,
@@ -99,10 +97,12 @@
 
   MENU_REPORT_CITIES,
   MENU_REPORT_UNITS,
+  MENU_REPORT_PLAYERS,
   MENU_REPORT_ECONOMY,
   MENU_REPORT_SCIENCE,
   MENU_REPORT_WOW,
   MENU_REPORT_TOP_CITIES,
+  MENU_REPORT_MESSAGES,
   MENU_REPORT_DEMOGRAPHIC,
   MENU_REPORT_SPACESHIP,