diff --git a/src/callbacks.c b/src/callbacks.c
index 4e01c45b..ecf3e384 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -49,21 +49,26 @@
 #include "user.h"
 #include "window.h"
 
-gboolean
-on_button_quit_clicked                 (GtkWidget       *widget,
-                                        GdkEvent        *event,
+/***********************************************************************************************************
+******************************************** FILE MENU CALLBACKS *******************************************
+***********************************************************************************************************/
+
+void
+on_menu_load_last_save_activate        (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
 #ifdef DEBUG
-    printf("on_button_quit_clicked\n");
+    printf("on_menu_load_last_save_activate\n");
 #endif
 
-    on_menu_quit_activate(NULL, NULL);
-
-    return TRUE;
+    if(load_save_load_game("last_save", FALSE))
+    {
+	cur_user = 0;
+	on_button_back_to_main_clicked(NULL, NULL);
+	setsav1;
+    }
 }
 
-
 void
 on_menu_new_activate                   (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -141,6 +146,9 @@ on_menu_quit_activate                  (GtkMenuItem     *menuitem,
 }
 
 
+/***********************************************************************************************************
+******************************************** HELP MENU CALLBACKS *******************************************
+***********************************************************************************************************/
 
 
 void
@@ -179,6 +187,101 @@ on_menu_about_activate                 (GtkMenuItem     *menuitem,
 }
 
 
+/***********************************************************************************************************
+******************************************** TOOLBAR CALLBACKS *********************************************
+***********************************************************************************************************/
+
+gboolean
+on_button_quit_clicked                 (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_button_quit_clicked\n");
+#endif
+
+    on_menu_quit_activate(NULL, NULL);
+
+    return TRUE;
+}
+
+
+gboolean
+on_eventbox_style_button_press_event   (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_eventbox_style_button_press_event\n");
+#endif
+
+    gint new_style = -1;
+
+    if(event->type != GDK_BUTTON_PRESS)
+	return FALSE;
+
+    if(event->button == 3)
+	new_style = (current_user.tm->style != 2) ?
+	    current_user.tm->style + 1 : -2;
+    else if(event->button == 1)
+	new_style = (current_user.tm->style != -2) ?
+	    current_user.tm->style - 1 : 2;
+    else
+	return FALSE;
+
+    team_change_attribute_with_message(current_user.tm, TEAM_ATTRIBUTE_STYLE, new_style);
+
+    game_gui_write_meters(current_user.tm);
+    game_gui_write_radio_items();
+    
+    if(stat0 == STATUS_MAIN)
+	treeview_show_next_opponent();
+
+    setsav0;
+
+    return FALSE;
+}
+
+
+gboolean
+on_eventbox_boost_button_press_event   (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_eventbox_boost_button_press_event\n");
+#endif
+
+    gint new_boost = -1; 
+
+    if(event->type != GDK_BUTTON_PRESS)
+	return FALSE;
+
+    if(event->button == 3)
+	new_boost = (current_user.tm->boost != 1) ?
+	    current_user.tm->boost + 1 : -1;
+    else if(event->button == 1)
+	new_boost = (current_user.tm->boost != -1) ?
+	    current_user.tm->boost - 1 : 1;
+    else
+	return FALSE;
+
+    if(new_boost == 1 && sett_int("int_opt_disable_boost_on"))
+	game_gui_print_message(_("Boost ON is disabled in this country definition."));
+    else
+	team_change_attribute_with_message(current_user.tm, TEAM_ATTRIBUTE_BOOST, new_boost);
+
+    game_gui_write_meters(current_user.tm);
+    game_gui_write_radio_items();
+
+    if(stat0 == STATUS_MAIN)
+	treeview_show_next_opponent();
+
+    setsav0;
+
+    return FALSE;
+}
+
 void
 on_button_load_clicked                 (GtkButton       *button,
                                         gpointer         user_data)
@@ -289,6 +392,114 @@ on_button_new_week_clicked             (GtkButton       *button,
     }
 }
 
+/***********************************************************************************************************
+******************************************** TREEVIEW CALLBACKS ********************************************
+***********************************************************************************************************/
+
+gboolean
+on_treeview_right_button_press_event   (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_treeview_right_button_press_event\n");
+#endif
+
+    gint idx;
+
+    if(stat0 == STATUS_SHOW_FINANCES)
+    {
+	if(event->button == 1)
+	    callback_get_loan();
+	else if(event->button == 3)
+	    callback_pay_loan();
+	else if(event->button == 2)
+	    on_menu_show_stadium_activate(NULL, NULL);
+    }
+
+    if(gtk_tree_selection_get_mode(
+	   gtk_tree_view_get_selection(GTK_TREE_VIEW(widget))) ==
+       GTK_SELECTION_NONE)
+	return TRUE;
+
+    if(treeview_helper_select_row(GTK_TREE_VIEW(widget), event))
+	idx = treeview_helper_get_index(GTK_TREE_VIEW(widget), 0);
+    else
+	return TRUE;
+
+    switch(stat0)
+    {
+	case STATUS_SHOW_TRANSFER_LIST:
+	    if(trans(idx - 1).tm == current_user.tm ||
+	       (trans(idx - 1).offers->len > 0 && 
+		transoff(idx - 1, 0).status == TRANSFER_OFFER_ACCEPTED) ||
+	       event->button == 1)
+		callback_transfer_list_clicked(event->button, idx - 1);
+	    else if(event->button == 3)
+	    {
+		if(transfer_remove_offer(idx - 1, current_user.tm))
+		    game_gui_print_message(_("Your offer has been removed."));
+		else
+		    game_gui_print_message(
+			_("You haven't made an offer for the player."));
+		return TRUE;
+	    }
+	    break;
+	case STATUS_SHOW_TEAM_LIST:
+	    callback_show_team(SHOW_CURRENT);
+	    break;
+	case STATUS_MAIN:
+	    callback_show_next_opponent();
+	    break;
+	case STATUS_SHOW_PLAYER_LIST:
+	    callback_show_player_team();
+	    break;
+	case STATUS_SHOW_YA:
+	    selected_row = idx - 1;
+	    if(event->button == 1)
+		on_menu_youth_move_to_team_activate(NULL, NULL);
+	    else if(event->button == 3)
+		window_show_menu_youth((GdkEvent*)event);
+	    break;
+	case STATUS_SHOW_JOB_EXCHANGE:
+	    if(g_array_index(jobs, Job, idx - 1).type != JOB_TYPE_NATIONAL &&
+	       users->len > 1)
+		game_gui_show_warning(_("You can't apply for a job from abroad if there's more than one user."));
+	    else if(event->button == 1)
+		game_gui_show_job_offer(NULL, 
+					&g_array_index(jobs, Job, idx - 1),
+					STATUS_JOB_EXCHANGE_SHOW_TEAM);
+	    else if(event->button == 3)
+		if(misc2_callback_evaluate_job_application(
+		       &g_array_index(jobs, Job, idx - 1), &current_user))
+		{
+		    stat0 = STATUS_MAIN;
+		    game_gui_show_main();
+		    setsav0;
+		}
+	    break;
+
+    case STATUS_SHOW_TABLES:
+        stat0 = STATUS_SHOW_FIXTURES;
+        stat2 = week;
+        stat3 = week_round;
+        callback_show_fixtures(SHOW_CURRENT);
+        break;
+    case STATUS_SHOW_FIXTURES:
+        if(stat1 >= ID_CUP_START && cup_has_tables(stat1) == -1)
+            game_gui_print_message(_("Cup has no tables."));
+        else
+        {
+            stat0 = STATUS_SHOW_TABLES;
+            callback_show_tables(SHOW_CURRENT);   
+        }
+        break;
+    }
+    
+    gui_set_arrows();
+
+    return TRUE;
+}
 
 gboolean
 on_player_list1_button_press_event     (GtkWidget       *widget,
@@ -355,6 +566,10 @@ on_player_list1_key_press_event        (GtkWidget       *widget,
 }
 
 
+/***********************************************************************************************************
+******************************************** ARROW BUTTON CALLBACKS ****************************************
+***********************************************************************************************************/
+
 void
 on_button_browse_forward_clicked       (GtkButton       *button,
                                         gpointer         user_data)
@@ -477,6 +692,37 @@ on_button_cl_forward_clicked           (GtkButton       *button,
 }
 
 
+/***********************************************************************************************************
+******************************************** PREFERENCES MENU CALLBACKS ************************************
+***********************************************************************************************************/
+
+void
+on_menu_save_window_geometry_activate  (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_save_window_geometry_activate\n");
+#endif
+
+    window_main_save_geometry();
+}
+
+gboolean
+on_menu_check_button_press_event       (GtkWidget       *widget,
+                                        GdkEventButton  *event,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_check_button_press_event\n");
+#endif
+
+    game_gui_read_check_items(widget);
+
+    setsav0;
+	
+    return FALSE;
+}
+
 void
 on_menu_preferences_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -488,6 +734,10 @@ on_menu_preferences_activate           (GtkMenuItem     *menuitem,
     window_show_options();
 }
 
+/***********************************************************************************************************
+******************************************** FIGURES CALLBACKS *********************************************
+***********************************************************************************************************/
+
 void
 on_menu_fixtures_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -591,6 +841,78 @@ on_menu_season_history_activate        (GtkMenuItem     *menuitem,
 }
 
 
+/***********************************************************************************************************
+******************************************** PLAYER MENU CALLBACKS *****************************************
+***********************************************************************************************************/
+
+void
+on_menu_edit_name_activate             (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+void
+on_menu_browse_players_activate        (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_browse_players_activate\n");
+#endif
+
+    stat0 = STATUS_SHOW_PLAYER_LIST;
+    callback_show_player_list(SHOW_CURRENT);
+
+    gui_set_arrows();
+}
+
+void
+on_menu_offer_new_contract_activate    (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_offer_new_contract_activate\n");
+#endif
+
+    if(sett_int("int_opt_disable_contracts"))
+    {
+	game_gui_print_message(_("Contracts are disabled in this country definition."));
+	return;
+    }
+
+    if(selected_row == -1)
+    {
+	game_gui_print_message(_("You haven't selected a player."));
+	return;
+    }
+
+    callback_offer_new_contract(selected_row);
+
+    setsav0;
+}
+
+
+void
+on_menu_show_info_activate      (GtkMenuItem     *menuitem,
+				 gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_show_info_activate\n");
+#endif
+
+    if(selected_row == -1)
+    {
+	game_gui_print_message(_("You haven't selected a player."));
+	return;
+    }    
+
+    if(stat0 != STATUS_LIVE_GAME_PAUSE)
+	stat0 = STATUS_SHOW_PLAYER_INFO;
+    treeview_show_player_info(player_of_idx_team(current_user.tm, selected_row));
+
+    gui_set_arrows();
+}
+
 void
 on_menu_put_on_transfer_list_activate  (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -724,486 +1046,30 @@ on_menu_move_to_youth_academy_activate (GtkMenuItem     *menuitem,
     }
 }
 
-
-void
-on_menu_my_league_results_activate     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_my_league_results_activate\n");
-#endif
-
-    stat0 = STATUS_SHOW_LEAGUE_RESULTS;
-    treeview_show_league_results(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")));
-
-    gui_set_arrows();
-}
+/***********************************************************************************************************
+******************************************** PLAYER CONTEXT MENU CALLBACKS *********************************
+***********************************************************************************************************/
 
 
 
 void
-on_menu_season_results_activate        (GtkMenuItem     *menuitem,
+on_player_menu_edit_name_activate      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-#ifdef DEBUG
-    printf("on_menu_season_results_activate\n");
-#endif
 
-    stat0 = STATUS_SHOW_SEASON_RESULTS;
-    treeview2_show_season_results();
-    gui_set_arrows();
-}
-
-
-void
-on_menu_browse_teams_activate          (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_browse_teams_activate\n");
-#endif
-
-    GtkWidget *treeview_right =
-	lookup_widget(window.main, "treeview_right");
-
-    treeview_show_team_list(GTK_TREE_VIEW(treeview_right), TRUE, TRUE);
-
-    stat0 = STATUS_SHOW_TEAM_LIST;
-
-    gui_set_arrows();
-}
-
-
-gboolean
-on_treeview_right_button_press_event   (GtkWidget       *widget,
-                                        GdkEventButton  *event,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_treeview_right_button_press_event\n");
-#endif
-
-    gint idx;
-
-    if(stat0 == STATUS_SHOW_FINANCES)
-    {
-	if(event->button == 1)
-	    callback_get_loan();
-	else if(event->button == 3)
-	    callback_pay_loan();
-	else if(event->button == 2)
-	    on_menu_show_stadium_activate(NULL, NULL);
-    }
-
-    if(gtk_tree_selection_get_mode(
-	   gtk_tree_view_get_selection(GTK_TREE_VIEW(widget))) ==
-       GTK_SELECTION_NONE)
-	return TRUE;
-
-    if(treeview_helper_select_row(GTK_TREE_VIEW(widget), event))
-	idx = treeview_helper_get_index(GTK_TREE_VIEW(widget), 0);
-    else
-	return TRUE;
-
-    switch(stat0)
-    {
-	case STATUS_SHOW_TRANSFER_LIST:
-	    if(trans(idx - 1).tm == current_user.tm ||
-	       (trans(idx - 1).offers->len > 0 && 
-		transoff(idx - 1, 0).status == TRANSFER_OFFER_ACCEPTED) ||
-	       event->button == 1)
-		callback_transfer_list_clicked(event->button, idx - 1);
-	    else if(event->button == 3)
-	    {
-		if(transfer_remove_offer(idx - 1, current_user.tm))
-		    game_gui_print_message(_("Your offer has been removed."));
-		else
-		    game_gui_print_message(
-			_("You haven't made an offer for the player."));
-		return TRUE;
-	    }
-	    break;
-	case STATUS_SHOW_TEAM_LIST:
-	    callback_show_team(SHOW_CURRENT);
-	    break;
-	case STATUS_MAIN:
-	    callback_show_next_opponent();
-	    break;
-	case STATUS_SHOW_PLAYER_LIST:
-	    callback_show_player_team();
-	    break;
-	case STATUS_SHOW_YA:
-	    selected_row = idx - 1;
-	    if(event->button == 1)
-		on_menu_youth_move_to_team_activate(NULL, NULL);
-	    else if(event->button == 3)
-		window_show_menu_youth((GdkEvent*)event);
-	    break;
-	case STATUS_SHOW_JOB_EXCHANGE:
-	    if(g_array_index(jobs, Job, idx - 1).type != JOB_TYPE_NATIONAL &&
-	       users->len > 1)
-		game_gui_show_warning(_("You can't apply for a job from abroad if there's more than one user."));
-	    else if(event->button == 1)
-		game_gui_show_job_offer(NULL, 
-					&g_array_index(jobs, Job, idx - 1),
-					STATUS_JOB_EXCHANGE_SHOW_TEAM);
-	    else if(event->button == 3)
-		if(misc2_callback_evaluate_job_application(
-		       &g_array_index(jobs, Job, idx - 1), &current_user))
-		{
-		    stat0 = STATUS_MAIN;
-		    game_gui_show_main();
-		    setsav0;
-		}
-	    break;
-
-    case STATUS_SHOW_TABLES:
-        stat0 = STATUS_SHOW_FIXTURES;
-        stat2 = week;
-        stat3 = week_round;
-        callback_show_fixtures(SHOW_CURRENT);
-        break;
-    case STATUS_SHOW_FIXTURES:
-        if(stat1 >= ID_CUP_START && cup_has_tables(stat1) == -1)
-            game_gui_print_message(_("Cup has no tables."));
-        else
-        {
-            stat0 = STATUS_SHOW_TABLES;
-            callback_show_tables(SHOW_CURRENT);   
-        }
-        break;
-    }
-    
-    gui_set_arrows();
-
-    return TRUE;
 }
 
 void
-on_menu_next_user_activate             (GtkMenuItem     *menuitem,
+on_player_menu_show_info_activate      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
 #ifdef DEBUG
-    printf("on_menu_next_user_activate\n");
+    printf("on_player_menu_show_info_activate\n");
 #endif
 
-    if(transfer_offers_pending())
-    {
-	game_gui_show_warning(_("You still have some transfer business to manage."));
-	return;
-    }
-
-    cur_user = (cur_user + 1) % users->len;
-    user_event_show_next();
-
-    on_button_back_to_main_clicked(NULL, NULL);
+    on_menu_show_info_activate(NULL, NULL);
 }
 
-
-void
-on_menu_previous_user_activate         (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_previous_user_activate\n");
-#endif
-
-    if(transfer_offers_pending())
-    {
-	game_gui_show_warning(_("You still have some transfer business to manage."));
-	return;
-    }
-
-    cur_user = (cur_user == 0) ? users->len - 1 : cur_user - 1;
-    user_event_show_next();
-
-    on_button_back_to_main_clicked(NULL, NULL);
-}
-
-
-void
-on_menu_custom_structure_activate      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_custom_structure_activate\n");
-#endif
-
-    stat1 = STATUS_CUSTOM_STRUCTURE;
-    window_show_digits(_("Enter a structure. The digits must sum up to 10."),
-		       NULL, -1, _("Structure"), current_user.tm->structure, FALSE);
-}
-
-
-gboolean
-on_menu_team_button_release_event        (GtkWidget       *widget,
-					  GdkEventButton  *event,
-					  gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_team_button_release_event\n");
-#endif
-
-    game_gui_read_radio_items(widget);
-    setsav0;
-
-    return FALSE;
-}
-
-void
-on_menu_manage_users_activate          (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_manage_users_activate\n");
-#endif
-
-    stat0 = stat1 = STATUS_USER_MANAGEMENT;
-    window_create(WINDOW_USER_MANAGEMENT);
-    treeview_show_users(GTK_TREE_VIEW(lookup_widget(window.user_management, "treeview_user_management_users")));
-    treeview_show_team_list(GTK_TREE_VIEW(lookup_widget(window.user_management, "treeview_user_management_teams")),
-			    FALSE, FALSE);
-}
-
-
-void
-on_menu_user_show_last_match_activate  (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_user_show_last_match_activate\n");
-#endif
-
-    if(current_user.live_game.units->len == 0)
-    {
-	game_gui_show_warning(_("No match stored."));
-	return;
-    }
-
-    stat1 = STATUS_SHOW_LAST_MATCH;
-    stat3 = 0;
-    callback_show_last_match(TRUE, &current_user.live_game);
-}
-
-
-void
-on_menu_user_show_last_stats_activate  (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_user_show_last_stats_activate\n");
-#endif
-
-    if(current_user.live_game.units->len == 0)
-    {
-	game_gui_show_warning(_("No match stored."));
-	return;
-    }
-
-    stat0 = STATUS_SHOW_LAST_MATCH_STATS;
-    callback_show_last_match_stats();
-
-    gui_set_arrows();
-}
-
-
-void
-on_menu_user_show_coming_matches_activate
-                                        (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_user_show_coming_matches_activate\n");
-#endif
-
-    stat0 = STATUS_SHOW_PREVIEW;
-    treeview_show_preview();
-
-    gui_set_arrows();
-}
-
-
-gboolean
-on_eventbox_style_button_press_event   (GtkWidget       *widget,
-                                        GdkEventButton  *event,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_eventbox_style_button_press_event\n");
-#endif
-
-    gint new_style = -1;
-
-    if(event->type != GDK_BUTTON_PRESS)
-	return FALSE;
-
-    if(event->button == 3)
-	new_style = (current_user.tm->style != 2) ?
-	    current_user.tm->style + 1 : -2;
-    else if(event->button == 1)
-	new_style = (current_user.tm->style != -2) ?
-	    current_user.tm->style - 1 : 2;
-    else
-	return FALSE;
-
-    team_change_attribute_with_message(current_user.tm, TEAM_ATTRIBUTE_STYLE, new_style);
-
-    game_gui_write_meters(current_user.tm);
-    game_gui_write_radio_items();
-    
-    if(stat0 == STATUS_MAIN)
-	treeview_show_next_opponent();
-
-    setsav0;
-
-    return FALSE;
-}
-
-
-gboolean
-on_eventbox_boost_button_press_event   (GtkWidget       *widget,
-                                        GdkEventButton  *event,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_eventbox_boost_button_press_event\n");
-#endif
-
-    gint new_boost = -1; 
-
-    if(event->type != GDK_BUTTON_PRESS)
-	return FALSE;
-
-    if(event->button == 3)
-	new_boost = (current_user.tm->boost != 1) ?
-	    current_user.tm->boost + 1 : -1;
-    else if(event->button == 1)
-	new_boost = (current_user.tm->boost != -1) ?
-	    current_user.tm->boost - 1 : 1;
-    else
-	return FALSE;
-
-    if(new_boost == 1 && sett_int("int_opt_disable_boost_on"))
-	game_gui_print_message(_("Boost ON is disabled in this country definition."));
-    else
-	team_change_attribute_with_message(current_user.tm, TEAM_ATTRIBUTE_BOOST, new_boost);
-
-    game_gui_write_meters(current_user.tm);
-    game_gui_write_radio_items();
-
-    if(stat0 == STATUS_MAIN)
-	treeview_show_next_opponent();
-
-    setsav0;
-
-    return FALSE;
-}
-
-void
-on_menu_show_finances_activate         (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_show_finances_activate\n");
-#endif
-
-    if(sett_int("int_opt_disable_finances"))
-    {
-	game_gui_print_message(_("Finances are disabled in this country definition."));
-	return;
-    }
-
-    stat0 = STATUS_SHOW_FINANCES;
-    game_gui_print_message(_("Left-click: get loan; Right-click: pay back; Middle click: stadium window."));
-    treeview_show_finances(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")),
-			   &current_user);
-
-    gui_set_arrows();
-}
-
-
-void
-on_menu_show_stadium_activate          (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_show_stadium_activate\n");
-#endif
-
-    if(sett_int("int_opt_disable_stadium"))
-    {
-	game_gui_print_message(
-	    _("Stadium management is disabled in this country definition."));
-	return;
-    }
-
-    window_show_stadium();
-}
-
-gboolean
-on_menu_check_button_press_event       (GtkWidget       *widget,
-                                        GdkEventButton  *event,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_check_button_press_event\n");
-#endif
-
-    game_gui_read_check_items(widget);
-
-    setsav0;
-	
-    return FALSE;
-}
-
-void
-on_menu_offer_new_contract_activate    (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_offer_new_contract_activate\n");
-#endif
-
-    if(sett_int("int_opt_disable_contracts"))
-    {
-	game_gui_print_message(_("Contracts are disabled in this country definition."));
-	return;
-    }
-
-    if(selected_row == -1)
-    {
-	game_gui_print_message(_("You haven't selected a player."));
-	return;
-    }
-
-    callback_offer_new_contract(selected_row);
-
-    setsav0;
-}
-
-
-void
-on_menu_show_info_activate      (GtkMenuItem     *menuitem,
-				 gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_show_info_activate\n");
-#endif
-
-    if(selected_row == -1)
-    {
-	game_gui_print_message(_("You haven't selected a player."));
-	return;
-    }    
-
-    if(stat0 != STATUS_LIVE_GAME_PAUSE)
-	stat0 = STATUS_SHOW_PLAYER_INFO;
-    treeview_show_player_info(player_of_idx_team(current_user.tm, selected_row));
-
-    gui_set_arrows();
-}
-
-
 void
 on_player_menu_put_on_transfer_list_activate
                                         (GtkMenuItem     *menuitem,
@@ -1279,61 +1145,9 @@ on_player_menu_move_to_youth_academy_activate
     on_menu_move_to_youth_academy_activate(NULL, NULL);
 }
 
-
-void
-on_menu_browse_players_activate        (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_browse_players_activate\n");
-#endif
-
-    stat0 = STATUS_SHOW_PLAYER_LIST;
-    callback_show_player_list(SHOW_CURRENT);
-
-    gui_set_arrows();
-}
-
-void
-on_player_menu_show_info_activate      (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_player_menu_show_info_activate\n");
-#endif
-
-    on_menu_show_info_activate(NULL, NULL);
-}
-
-
-void
-on_menu_rearrange_team_activate        (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_rearrange_team_activate\n");
-#endif
-
-    team_rearrange(current_user.tm);
-    treeview_show_user_player_list();
-}
-
-
-void
-on_menu_load_last_save_activate        (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_load_last_save_activate\n");
-#endif
-
-    if(load_save_load_game("last_save", FALSE))
-    {
-	cur_user = 0;
-	on_button_back_to_main_clicked(NULL, NULL);
-	setsav1;
-    }
-}
+/***********************************************************************************************************
+******************************************** STATS MENU CALLBACKS ******************************************
+***********************************************************************************************************/
 
 void
 on_menu_user_show_history_activate     (GtkMenuItem     *menuitem,
@@ -1350,65 +1164,89 @@ on_menu_user_show_history_activate     (GtkMenuItem     *menuitem,
 }
 
 void
-on_button_reset_players_clicked        (GtkButton       *button,
+on_mm_add_last_match_activate          (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
 #ifdef DEBUG
-    printf("on_button_reset_players_clicked\n");
+    printf("on_mm_add_last_match_activate\n");
 #endif
 
-    on_menu_reset_players_activate(NULL, NULL);
+    if(current_user.live_game.units->len == 0)
+    {
+	game_gui_show_warning(_("No match stored."));
+	return;
+    }
+
+    if(current_user.mmatches_file == NULL)
+    {
+	stat5 = STATUS_SELECT_MM_FILE_ADD;
+	window_show_file_sel();
+    }
+    else
+	user_mm_add_last_match(FALSE, TRUE);
 }
 
 
 void
-on_menu_reset_players_activate         (GtkMenuItem     *menuitem,
+on_mm_manage_matches_activate          (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
 #ifdef DEBUG
-    printf("on_menu_reset_players_activate\n");
+    printf("on_mm_manage_matches_activate\n");
 #endif
 
-    gint idx = -1;
-
-    if(team_is_user(usr(stat2).live_game.fix->teams[0]) == -1 ||
-       team_is_user(usr(stat2).live_game.fix->teams[1]) == -1)
-	idx  = (team_is_user(usr(stat2).live_game.fix->teams[0]) == -1);
+    if(current_user.mmatches_file == NULL)
+    {
+	stat5 = STATUS_SELECT_MM_FILE_LOAD;
+	window_show_file_sel();
+    }
     else
-    {
-	if(team_is_user(usr(stat2).live_game.fix->teams[0]) == cur_user)
-	    idx = 0;
-	else
-	    idx = 1;
-    }
-    
-    game_reset_players(idx);
+	window_show_mmatches();
 }
 
-gboolean
-on_button_quit_button_press_event      (GtkWidget       *widget,
-                                        GdkEventButton  *event,
+
+void
+on_menu_news_activate                  (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+    window_create(WINDOW_NEWS);
+    treeview2_show_news();
+    counters[COUNT_NEWS_SHOWN] = 1;
+}
+
+void
+on_menu_my_league_results_activate     (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
 #ifdef DEBUG
-    printf("on_button_quit_button_press_event\n");
+    printf("on_menu_my_league_results_activate\n");
 #endif
 
-    if(event->button == 3 && counters[COUNT_SHOW_DEBUG] == 0)
-    {
-	counters[COUNT_SHOW_DEBUG] = 1;
-	g_timeout_add(3000, (GSourceFunc)debug_reset_counter, NULL);
-    }
-    else if(event->button == 2 && counters[COUNT_SHOW_DEBUG] == 1)
-    {
-	window_create(WINDOW_DEBUG);
-	counters[COUNT_SHOW_DEBUG] = 0;
-    }
+    stat0 = STATUS_SHOW_LEAGUE_RESULTS;
+    treeview_show_league_results(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")));
 
-    return FALSE;
+    gui_set_arrows();
 }
 
 
+
+void
+on_menu_season_results_activate        (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_season_results_activate\n");
+#endif
+
+    stat0 = STATUS_SHOW_SEASON_RESULTS;
+    treeview2_show_season_results();
+    gui_set_arrows();
+}
+
+/***********************************************************************************************************
+******************************************** TEAM MENU CALLBACKS *******************************************
+***********************************************************************************************************/
+
 void
 on_menu_show_youth_academy_activate    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -1449,6 +1287,324 @@ on_menu_set_investment_activate        (GtkMenuItem     *menuitem,
 	NULL, -1, "%", current_user.youth_academy.percentage, FALSE);
 }
 
+void
+on_menu_show_job_exchange_activate     (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_show_job_exchange_activate\n");
+#endif
+
+    stat0 = STATUS_SHOW_JOB_EXCHANGE;
+
+    gui_set_arrows();
+
+    treeview2_show_job_exchange();
+
+    game_gui_print_message(
+	_("Right click to apply for job at once, left click to see team info."));
+    game_gui_print_message_with_delay(
+	_("The job exchange update interval is %d weeks."),
+	const_int("int_job_update_interval"));
+}
+
+void
+on_training_camp_activate              (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_training_camp_activate\n");
+#endif
+
+   if(sett_int("int_opt_disable_training_camp"))
+    {
+	game_gui_print_message(
+	    _("Training camp is disabled in this country definition."));
+	return;
+    }
+
+   if(current_user.counters[COUNT_USER_TRAININGS_WEEK] == 
+      const_int("int_training_camps_week"))
+   {
+       game_gui_print_message(_("Your team has already had enough training camps this week."));
+       return;
+   }
+
+   if(current_user.counters[COUNT_USER_TRAININGS_LEFT_SEASON] == 0)
+   {
+       game_gui_print_message(_("You've reached the limit of %d training camps for the season."),
+			      const_int("int_training_camps_per_season"));
+       return;
+   }
+
+   window_show_training_camp();
+}
+
+void
+on_menu_rearrange_team_activate        (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_rearrange_team_activate\n");
+#endif
+
+    team_rearrange(current_user.tm);
+    treeview_show_user_player_list();
+}
+
+gboolean
+on_menu_team_button_release_event        (GtkWidget       *widget,
+					  GdkEventButton  *event,
+					  gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_team_button_release_event\n");
+#endif
+
+    game_gui_read_radio_items(widget);
+    setsav0;
+
+    return FALSE;
+}
+
+void
+on_menu_custom_structure_activate      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_custom_structure_activate\n");
+#endif
+
+    stat1 = STATUS_CUSTOM_STRUCTURE;
+    window_show_digits(_("Enter a structure. The digits must sum up to 10."),
+		       NULL, -1, _("Structure"), current_user.tm->structure, FALSE);
+}
+
+void
+on_menu_browse_teams_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_browse_teams_activate\n");
+#endif
+
+    GtkWidget *treeview_right =
+	lookup_widget(window.main, "treeview_right");
+
+    treeview_show_team_list(GTK_TREE_VIEW(treeview_right), TRUE, TRUE);
+
+    stat0 = STATUS_SHOW_TEAM_LIST;
+
+    gui_set_arrows();
+}
+
+/***********************************************************************************************************
+******************************************** USER MENU CALLBACKS *******************************************
+***********************************************************************************************************/
+
+void
+on_menu_next_user_activate             (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_next_user_activate\n");
+#endif
+
+    if(transfer_offers_pending())
+    {
+	game_gui_show_warning(_("You still have some transfer business to manage."));
+	return;
+    }
+
+    cur_user = (cur_user + 1) % users->len;
+    user_event_show_next();
+
+    on_button_back_to_main_clicked(NULL, NULL);
+}
+
+
+void
+on_menu_previous_user_activate         (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_previous_user_activate\n");
+#endif
+
+    if(transfer_offers_pending())
+    {
+	game_gui_show_warning(_("You still have some transfer business to manage."));
+	return;
+    }
+
+    cur_user = (cur_user == 0) ? users->len - 1 : cur_user - 1;
+    user_event_show_next();
+
+    on_button_back_to_main_clicked(NULL, NULL);
+}
+
+void
+on_menu_manage_users_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_manage_users_activate\n");
+#endif
+
+    stat0 = stat1 = STATUS_USER_MANAGEMENT;
+    window_create(WINDOW_USER_MANAGEMENT);
+    treeview_show_users(GTK_TREE_VIEW(lookup_widget(window.user_management, "treeview_user_management_users")));
+    treeview_show_team_list(GTK_TREE_VIEW(lookup_widget(window.user_management, "treeview_user_management_teams")),
+			    FALSE, FALSE);
+}
+
+
+void
+on_menu_user_show_last_match_activate  (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_user_show_last_match_activate\n");
+#endif
+
+    if(current_user.live_game.units->len == 0)
+    {
+	game_gui_show_warning(_("No match stored."));
+	return;
+    }
+
+    stat1 = STATUS_SHOW_LAST_MATCH;
+    stat3 = 0;
+    callback_show_last_match(TRUE, &current_user.live_game);
+}
+
+
+void
+on_menu_user_show_last_stats_activate  (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_user_show_last_stats_activate\n");
+#endif
+
+    if(current_user.live_game.units->len == 0)
+    {
+	game_gui_show_warning(_("No match stored."));
+	return;
+    }
+
+    stat0 = STATUS_SHOW_LAST_MATCH_STATS;
+    callback_show_last_match_stats();
+
+    gui_set_arrows();
+}
+
+
+void
+on_menu_user_show_coming_matches_activate
+                                        (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_user_show_coming_matches_activate\n");
+#endif
+
+    stat0 = STATUS_SHOW_PREVIEW;
+    treeview_show_preview();
+
+    gui_set_arrows();
+}
+
+/***********************************************************************************************************
+******************************************** FINSTAD MENU CALLBACKS ****************************************
+***********************************************************************************************************/
+
+
+void
+on_menu_betting_activate               (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_betting_activate\n");
+#endif
+
+    on_button_back_to_main_clicked(NULL, NULL);
+    window_show_bets();
+}
+
+void
+on_automatic_loan_repayment_activate   (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_automatic_loan_repayment_activate\n");
+#endif
+
+    if(sett_int("int_opt_disable_finances"))
+    {
+	game_gui_print_message(_("Finances are disabled in this country definition."));
+	return;
+    }
+
+    if(current_user.debt == 0)
+    {
+        game_gui_print_message(_("You are not in debt."));
+        return;
+    }
+    else if(week >= fixture_get_last_scheduled_week() - 1)
+    {
+        game_gui_print_message(_("It's too late in the season for automatic loan repayment."));
+        return;            
+    }
+    
+    window_show_alr();
+}
+
+void
+on_menu_show_finances_activate         (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_show_finances_activate\n");
+#endif
+
+    if(sett_int("int_opt_disable_finances"))
+    {
+	game_gui_print_message(_("Finances are disabled in this country definition."));
+	return;
+    }
+
+    stat0 = STATUS_SHOW_FINANCES;
+    game_gui_print_message(_("Left-click: get loan; Right-click: pay back; Middle click: stadium window."));
+    treeview_show_finances(GTK_TREE_VIEW(lookup_widget(window.main, "treeview_right")),
+			   &current_user);
+
+    gui_set_arrows();
+}
+
+
+void
+on_menu_show_stadium_activate          (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_show_stadium_activate\n");
+#endif
+
+    if(sett_int("int_opt_disable_stadium"))
+    {
+	game_gui_print_message(
+	    _("Stadium management is disabled in this country definition."));
+	return;
+    }
+
+    window_show_stadium();
+}
+
+/***********************************************************************************************************
+******************************************** YOUTH CONTEXT MENU CALLBACKS **********************************
+***********************************************************************************************************/
+
 void
 on_menu_youth_move_to_team_activate    (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -1500,90 +1656,9 @@ on_menu_youth_kick_out_of_academy_activate
     }
 }
 
-void
-on_mm_add_last_match_activate          (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_mm_add_last_match_activate\n");
-#endif
-
-    if(current_user.live_game.units->len == 0)
-    {
-	game_gui_show_warning(_("No match stored."));
-	return;
-    }
-
-    if(current_user.mmatches_file == NULL)
-    {
-	stat5 = STATUS_SELECT_MM_FILE_ADD;
-	window_show_file_sel();
-    }
-    else
-	user_mm_add_last_match(FALSE, TRUE);
-}
-
-
-void
-on_mm_manage_matches_activate          (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_mm_manage_matches_activate\n");
-#endif
-
-    if(current_user.mmatches_file == NULL)
-    {
-	stat5 = STATUS_SELECT_MM_FILE_LOAD;
-	window_show_file_sel();
-    }
-    else
-	window_show_mmatches();
-}
-
-void
-on_menu_save_window_geometry_activate  (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_save_window_geometry_activate\n");
-#endif
-
-    window_main_save_geometry();
-}
-
-void
-on_menu_betting_activate               (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_betting_activate\n");
-#endif
-
-    on_button_back_to_main_clicked(NULL, NULL);
-    window_show_bets();
-}
-
-void
-on_menu_show_job_exchange_activate     (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-#ifdef DEBUG
-    printf("on_menu_show_job_exchange_activate\n");
-#endif
-
-    stat0 = STATUS_SHOW_JOB_EXCHANGE;
-
-    gui_set_arrows();
-
-    treeview2_show_job_exchange();
-
-    game_gui_print_message(
-	_("Right click to apply for job at once, left click to see team info."));
-    game_gui_print_message_with_delay(
-	_("The job exchange update interval is %d weeks."),
-	const_int("int_job_update_interval"));
-}
+/***********************************************************************************************************
+******************************************** MISCELLANEOUS CALLBACKS ***************************************
+***********************************************************************************************************/
 
 gboolean
 on_hpaned2_button_release_event        (GtkWidget       *widget,
@@ -1600,72 +1675,63 @@ on_hpaned2_button_release_event        (GtkWidget       *widget,
     return FALSE;
 }
 
-void
-on_training_camp_activate              (GtkMenuItem     *menuitem,
+gboolean
+on_button_quit_button_press_event      (GtkWidget       *widget,
+                                        GdkEventButton  *event,
                                         gpointer         user_data)
 {
 #ifdef DEBUG
-    printf("on_training_camp_activate\n");
+    printf("on_button_quit_button_press_event\n");
 #endif
 
-   if(sett_int("int_opt_disable_training_camp"))
+    if(event->button == 3 && counters[COUNT_SHOW_DEBUG] == 0)
     {
-	game_gui_print_message(
-	    _("Training camp is disabled in this country definition."));
-	return;
+	counters[COUNT_SHOW_DEBUG] = 1;
+	g_timeout_add(3000, (GSourceFunc)debug_reset_counter, NULL);
+    }
+    else if(event->button == 2 && counters[COUNT_SHOW_DEBUG] == 1)
+    {
+	window_create(WINDOW_DEBUG);
+	counters[COUNT_SHOW_DEBUG] = 0;
     }
 
-   if(current_user.counters[COUNT_USER_TRAININGS_WEEK] == 
-      const_int("int_training_camps_week"))
-   {
-       game_gui_print_message(_("Your team has already had enough training camps this week."));
-       return;
-   }
-
-   if(current_user.counters[COUNT_USER_TRAININGS_LEFT_SEASON] == 0)
-   {
-       game_gui_print_message(_("You've reached the limit of %d training camps for the season."),
-			      const_int("int_training_camps_per_season"));
-       return;
-   }
-
-   window_show_training_camp();
+    return FALSE;
 }
 
 void
-on_automatic_loan_repayment_activate   (GtkMenuItem     *menuitem,
+on_button_reset_players_clicked        (GtkButton       *button,
                                         gpointer         user_data)
 {
 #ifdef DEBUG
-    printf("on_automatic_loan_repayment_activate\n");
+    printf("on_button_reset_players_clicked\n");
 #endif
 
-    if(sett_int("int_opt_disable_finances"))
-    {
-	game_gui_print_message(_("Finances are disabled in this country definition."));
-	return;
-    }
+    on_menu_reset_players_activate(NULL, NULL);
+}
 
-    if(current_user.debt == 0)
+
+void
+on_menu_reset_players_activate         (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_menu_reset_players_activate\n");
+#endif
+
+    gint idx = -1;
+
+    if(team_is_user(usr(stat2).live_game.fix->teams[0]) == -1 ||
+       team_is_user(usr(stat2).live_game.fix->teams[1]) == -1)
+	idx  = (team_is_user(usr(stat2).live_game.fix->teams[0]) == -1);
+    else
     {
-        game_gui_print_message(_("You are not in debt."));
-        return;
-    }
-    else if(week >= fixture_get_last_scheduled_week() - 1)
-    {
-        game_gui_print_message(_("It's too late in the season for automatic loan repayment."));
-        return;            
+	if(team_is_user(usr(stat2).live_game.fix->teams[0]) == cur_user)
+	    idx = 0;
+	else
+	    idx = 1;
     }
     
-    window_show_alr();
+    game_reset_players(idx);
 }
 
-void
-on_menu_news_activate                  (GtkMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
-    window_create(WINDOW_NEWS);
-    treeview2_show_news();
-    counters[COUNT_NEWS_SHOWN] = 1;
-}
 
diff --git a/src/callbacks.h b/src/callbacks.h
index 477c01f7..ca3be502 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -360,3 +360,11 @@ on_menu_news_activate                  (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 #endif
 
+
+void
+on_menu_edit_name_activate             (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_player_menu_edit_name_activate      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
diff --git a/src/interface.c b/src/interface.c
index 1706aa1a..98ae4e99 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -38,7 +38,7 @@ create_main_window (void)
   GtkWidget *menu_new;
   GtkWidget *menu_open;
   GtkWidget *menu_load_last_save;
-  GtkWidget *image2643;
+  GtkWidget *image2684;
   GtkWidget *menu_save;
   GtkWidget *menu_save_as;
   GtkWidget *trennlinie1;
@@ -46,30 +46,30 @@ create_main_window (void)
   GtkWidget *menu_options;
   GtkWidget *menu_options_menu;
   GtkWidget *menu_preferences;
-  GtkWidget *image2644;
+  GtkWidget *image2685;
   GtkWidget *trennlinie7;
   GtkWidget *menu_job_offers;
   GtkWidget *menu_live_game;
   GtkWidget *menu_overwrite;
   GtkWidget *trennlinie14;
   GtkWidget *menu_save_window_geometry;
-  GtkWidget *image2645;
+  GtkWidget *image2686;
   GtkWidget *menu_figures;
   GtkWidget *menu_figures_menu;
   GtkWidget *menu_fixtures_week;
-  GtkWidget *image2646;
+  GtkWidget *image2687;
   GtkWidget *menu_fixtures;
-  GtkWidget *image2647;
+  GtkWidget *image2688;
   GtkWidget *menu_tables;
-  GtkWidget *image2648;
+  GtkWidget *image2689;
   GtkWidget *menu_my_league_results;
-  GtkWidget *image2649;
+  GtkWidget *image2690;
   GtkWidget *menu_season_results;
-  GtkWidget *image2650;
+  GtkWidget *image2691;
   GtkWidget *menu_team;
   GtkWidget *menu_team_menu;
   GtkWidget *menu_playing_style;
-  GtkWidget *image2651;
+  GtkWidget *image2692;
   GtkWidget *menu_playing_style_menu;
   GSList *menu_all_out_defend_group = NULL;
   GtkWidget *menu_all_out_defend;
@@ -78,7 +78,7 @@ create_main_window (void)
   GtkWidget *menu_attack;
   GtkWidget *menu_all_out_attack;
   GtkWidget *menu_scout;
-  GtkWidget *image2652;
+  GtkWidget *image2693;
   GtkWidget *menu_scout_menu;
   GSList *menu_scout_best_group = NULL;
   GtkWidget *menu_scout_best;
@@ -86,7 +86,7 @@ create_main_window (void)
   GtkWidget *menu_scout_average;
   GtkWidget *menu_scout_bad;
   GtkWidget *menu_physio;
-  GtkWidget *image2653;
+  GtkWidget *image2694;
   GtkWidget *menu_physio_menu;
   GSList *menu_physio_best_group = NULL;
   GtkWidget *menu_physio_best;
@@ -94,7 +94,7 @@ create_main_window (void)
   GtkWidget *menu_physio_average;
   GtkWidget *menu_physio_bad;
   GtkWidget *menu_youth_academy;
-  GtkWidget *image2654;
+  GtkWidget *image2695;
   GtkWidget *menu_youth_academy_menu;
   GtkWidget *menu_show_youth_academy;
   GtkWidget *youth_coach1;
@@ -114,7 +114,7 @@ create_main_window (void)
   GtkWidget *menu_recruit4;
   GtkWidget *menu_set_investment;
   GtkWidget *menu_boost;
-  GtkWidget *image2655;
+  GtkWidget *image2696;
   GtkWidget *menu_boost_menu;
   GSList *menu_boost_on_group = NULL;
   GtkWidget *menu_boost_on;
@@ -124,56 +124,57 @@ create_main_window (void)
   GtkWidget *menu_training_camp;
   GtkWidget *trennlinie18;
   GtkWidget *menu_reset_players;
-  GtkWidget *image2656;
+  GtkWidget *image2697;
   GtkWidget *menu_custom_structure;
-  GtkWidget *image2657;
+  GtkWidget *image2698;
   GtkWidget *menu_rearrange_team;
-  GtkWidget *image2658;
+  GtkWidget *image2699;
   GtkWidget *trennlinie8;
   GtkWidget *menu_browse_teams;
-  GtkWidget *image2659;
+  GtkWidget *image2700;
   GtkWidget *trennlinie16;
   GtkWidget *menu_show_job_exchange;
   GtkWidget *menu_player;
   GtkWidget *menu_player_menu;
   GtkWidget *menu_show_info;
-  GtkWidget *image2660;
+  GtkWidget *image2701;
   GtkWidget *menu_put_on_transfer_list;
-  GtkWidget *image2661;
+  GtkWidget *image2702;
   GtkWidget *menu_remove_from_transfer_list;
-  GtkWidget *image2662;
+  GtkWidget *image2703;
   GtkWidget *menu_offer_new_contract;
-  GtkWidget *image2663;
+  GtkWidget *image2704;
   GtkWidget *menu_fire;
-  GtkWidget *image2664;
+  GtkWidget *image2705;
   GtkWidget *menu_shoots_penalties;
-  GtkWidget *image2665;
+  GtkWidget *image2706;
   GtkWidget *menu_move_to_youth_academy;
-  GtkWidget *image2666;
+  GtkWidget *image2707;
+  GtkWidget *menu_edit_name;
   GtkWidget *trennlinie10;
   GtkWidget *menu_browse_players;
-  GtkWidget *image2667;
+  GtkWidget *image2708;
   GtkWidget *menu_user;
   GtkWidget *menu_user_menu;
   GtkWidget *menu_user_show_last_match;
-  GtkWidget *image2668;
+  GtkWidget *image2709;
   GtkWidget *menu_user_show_last_stats;
-  GtkWidget *image2669;
+  GtkWidget *image2710;
   GtkWidget *menu_user_show_coming_matches;
-  GtkWidget *image2670;
+  GtkWidget *image2711;
   GtkWidget *trennlinie9;
   GtkWidget *menu_next_user;
-  GtkWidget *image2671;
+  GtkWidget *image2712;
   GtkWidget *menu_previous_user;
-  GtkWidget *image2672;
+  GtkWidget *image2713;
   GtkWidget *menu_manage_users;
-  GtkWidget *image2673;
+  GtkWidget *image2714;
   GtkWidget *menu_finances_stadium;
   GtkWidget *menu_finances_stadium_menu;
   GtkWidget *menu_show_finances;
-  GtkWidget *image2674;
+  GtkWidget *image2715;
   GtkWidget *menu_show_stadium;
-  GtkWidget *image2675;
+  GtkWidget *image2716;
   GtkWidget *automatic_loan_repayment;
   GtkWidget *trennlinie15;
   GtkWidget *menu_betting;
@@ -181,26 +182,26 @@ create_main_window (void)
   GtkWidget *stats1_menu;
   GtkWidget *menu_news;
   GtkWidget *menu_league_stats;
-  GtkWidget *image2676;
+  GtkWidget *image2717;
   GtkWidget *menu_season_history;
-  GtkWidget *image2677;
+  GtkWidget *image2718;
   GtkWidget *menu_user_show_history;
-  GtkWidget *image2678;
+  GtkWidget *image2719;
   GtkWidget *memorable_matches;
-  GtkWidget *image2679;
+  GtkWidget *image2720;
   GtkWidget *memorable_matches_menu;
   GtkWidget *mm_add_last_match;
-  GtkWidget *image2680;
+  GtkWidget *image2721;
   GtkWidget *mm_manage_matches;
-  GtkWidget *image2681;
+  GtkWidget *image2722;
   GtkWidget *menu_help1;
   GtkWidget *menu_help1_menu;
   GtkWidget *menu_about;
-  GtkWidget *image2682;
+  GtkWidget *image2723;
   GtkWidget *menu_contributors;
-  GtkWidget *image2683;
+  GtkWidget *image2724;
   GtkWidget *menu_help;
-  GtkWidget *image2684;
+  GtkWidget *image2725;
   GtkWidget *hbox1;
   GtkWidget *button_load;
   GtkWidget *image11;
@@ -321,9 +322,9 @@ create_main_window (void)
                               GDK_l, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2643 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2643);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image2643);
+  image2684 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2684);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image2684);
 
   menu_save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group);
   gtk_widget_show (menu_save);
@@ -356,9 +357,9 @@ create_main_window (void)
                               GDK_p, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2644 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2644);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image2644);
+  image2685 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2685);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image2685);
 
   trennlinie7 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie7);
@@ -389,9 +390,9 @@ create_main_window (void)
   gtk_container_add (GTK_CONTAINER (menu_options_menu), menu_save_window_geometry);
   gtk_tooltips_set_tip (tooltips, menu_save_window_geometry, _("Save window size, position and vertical divider"), NULL);
 
-  image2645 = create_pixmap (main_window, "menu_save_geometry.png");
-  gtk_widget_show (image2645);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_window_geometry), image2645);
+  image2686 = create_pixmap (main_window, "menu_save_geometry.png");
+  gtk_widget_show (image2686);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_window_geometry), image2686);
 
   menu_figures = gtk_menu_item_new_with_mnemonic (_("F_igures"));
   gtk_widget_show (menu_figures);
@@ -407,9 +408,9 @@ create_main_window (void)
                               GDK_F3, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2646 = create_pixmap (main_window, "menu_fixtures.png");
-  gtk_widget_show (image2646);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image2646);
+  image2687 = create_pixmap (main_window, "menu_fixtures.png");
+  gtk_widget_show (image2687);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image2687);
 
   menu_fixtures = gtk_image_menu_item_new_with_mnemonic (_("Fixtures (competitions)"));
   gtk_widget_show (menu_fixtures);
@@ -418,9 +419,9 @@ create_main_window (void)
                               GDK_F4, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2647 = create_pixmap (main_window, "menu_fixtures_comp.png");
-  gtk_widget_show (image2647);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image2647);
+  image2688 = create_pixmap (main_window, "menu_fixtures_comp.png");
+  gtk_widget_show (image2688);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image2688);
 
   menu_tables = gtk_image_menu_item_new_with_mnemonic (_("Tables"));
   gtk_widget_show (menu_tables);
@@ -429,9 +430,9 @@ create_main_window (void)
                               GDK_F5, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2648 = create_pixmap (main_window, "menu_table.png");
-  gtk_widget_show (image2648);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image2648);
+  image2689 = create_pixmap (main_window, "menu_table.png");
+  gtk_widget_show (image2689);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image2689);
 
   menu_my_league_results = gtk_image_menu_item_new_with_mnemonic (_("My league results"));
   gtk_widget_show (menu_my_league_results);
@@ -440,9 +441,9 @@ create_main_window (void)
                               GDK_F6, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2649 = create_pixmap (main_window, "menu_league_results.png");
-  gtk_widget_show (image2649);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image2649);
+  image2690 = create_pixmap (main_window, "menu_league_results.png");
+  gtk_widget_show (image2690);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image2690);
 
   menu_season_results = gtk_image_menu_item_new_with_mnemonic (_("Season results"));
   gtk_widget_show (menu_season_results);
@@ -451,9 +452,9 @@ create_main_window (void)
                               GDK_s, (GdkModifierType) GDK_SHIFT_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2650 = create_pixmap (main_window, "menu_season_res.png");
-  gtk_widget_show (image2650);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_results), image2650);
+  image2691 = create_pixmap (main_window, "menu_season_res.png");
+  gtk_widget_show (image2691);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_results), image2691);
 
   menu_team = gtk_menu_item_new_with_mnemonic (_("_Team"));
   gtk_widget_show (menu_team);
@@ -466,9 +467,9 @@ create_main_window (void)
   gtk_widget_show (menu_playing_style);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_playing_style);
 
-  image2651 = create_pixmap (main_window, "menu_style.png");
-  gtk_widget_show (image2651);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image2651);
+  image2692 = create_pixmap (main_window, "menu_style.png");
+  gtk_widget_show (image2692);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image2692);
 
   menu_playing_style_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_playing_style), menu_playing_style_menu);
@@ -507,9 +508,9 @@ create_main_window (void)
   gtk_widget_show (menu_scout);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_scout);
 
-  image2652 = create_pixmap (main_window, "menu_scout.png");
-  gtk_widget_show (image2652);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image2652);
+  image2693 = create_pixmap (main_window, "menu_scout.png");
+  gtk_widget_show (image2693);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image2693);
 
   menu_scout_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_scout), menu_scout_menu);
@@ -542,9 +543,9 @@ create_main_window (void)
   gtk_widget_show (menu_physio);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_physio);
 
-  image2653 = create_pixmap (main_window, "menu_physio.png");
-  gtk_widget_show (image2653);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image2653);
+  image2694 = create_pixmap (main_window, "menu_physio.png");
+  gtk_widget_show (image2694);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image2694);
 
   menu_physio_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_physio), menu_physio_menu);
@@ -577,9 +578,9 @@ create_main_window (void)
   gtk_widget_show (menu_youth_academy);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_youth_academy);
 
-  image2654 = create_pixmap (main_window, "menu_youth_academy.png");
-  gtk_widget_show (image2654);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image2654);
+  image2695 = create_pixmap (main_window, "menu_youth_academy.png");
+  gtk_widget_show (image2695);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image2695);
 
   menu_youth_academy_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_youth_academy), menu_youth_academy_menu);
@@ -668,9 +669,9 @@ create_main_window (void)
   gtk_widget_show (menu_boost);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_boost);
 
-  image2655 = create_pixmap (main_window, "menu_boost.png");
-  gtk_widget_show (image2655);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image2655);
+  image2696 = create_pixmap (main_window, "menu_boost.png");
+  gtk_widget_show (image2696);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image2696);
 
   menu_boost_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_boost), menu_boost_menu);
@@ -711,17 +712,17 @@ create_main_window (void)
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_reset_players);
   gtk_tooltips_set_tip (tooltips, menu_reset_players, _("Reset player list to the formation at the beginning of the live game pause (right click on player list)"), NULL);
 
-  image2656 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2656);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image2656);
+  image2697 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2697);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image2697);
 
   menu_custom_structure = gtk_image_menu_item_new_with_mnemonic (_("Enter custom structure"));
   gtk_widget_show (menu_custom_structure);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_custom_structure);
 
-  image2657 = create_pixmap (main_window, "menu_structure.png");
-  gtk_widget_show (image2657);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image2657);
+  image2698 = create_pixmap (main_window, "menu_structure.png");
+  gtk_widget_show (image2698);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image2698);
 
   menu_rearrange_team = gtk_image_menu_item_new_with_mnemonic (_("Rearrange team"));
   gtk_widget_show (menu_rearrange_team);
@@ -731,9 +732,9 @@ create_main_window (void)
                               GDK_r, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2658 = create_pixmap (main_window, "menu_rearrange.png");
-  gtk_widget_show (image2658);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image2658);
+  image2699 = create_pixmap (main_window, "menu_rearrange.png");
+  gtk_widget_show (image2699);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image2699);
 
   trennlinie8 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie8);
@@ -744,9 +745,9 @@ create_main_window (void)
   gtk_widget_show (menu_browse_teams);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_browse_teams);
 
-  image2659 = create_pixmap (main_window, "menu_browse_tms.png");
-  gtk_widget_show (image2659);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image2659);
+  image2700 = create_pixmap (main_window, "menu_browse_tms.png");
+  gtk_widget_show (image2700);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image2700);
 
   trennlinie16 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie16);
@@ -772,57 +773,61 @@ create_main_window (void)
   gtk_widget_show (menu_show_info);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_show_info);
 
-  image2660 = create_pixmap (main_window, "menu_player_info.png");
-  gtk_widget_show (image2660);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image2660);
+  image2701 = create_pixmap (main_window, "menu_player_info.png");
+  gtk_widget_show (image2701);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image2701);
 
   menu_put_on_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Put on transfer list"));
   gtk_widget_show (menu_put_on_transfer_list);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_put_on_transfer_list);
 
-  image2661 = create_pixmap (main_window, "menu_player_put_transfer.png");
-  gtk_widget_show (image2661);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image2661);
+  image2702 = create_pixmap (main_window, "menu_player_put_transfer.png");
+  gtk_widget_show (image2702);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image2702);
 
   menu_remove_from_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Remove from transfer list"));
   gtk_widget_show (menu_remove_from_transfer_list);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_remove_from_transfer_list);
 
-  image2662 = create_pixmap (main_window, "menu_player_remove_transfer.png");
-  gtk_widget_show (image2662);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image2662);
+  image2703 = create_pixmap (main_window, "menu_player_remove_transfer.png");
+  gtk_widget_show (image2703);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image2703);
 
   menu_offer_new_contract = gtk_image_menu_item_new_with_mnemonic (_("Offer new contract"));
   gtk_widget_show (menu_offer_new_contract);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_offer_new_contract);
 
-  image2663 = create_pixmap (main_window, "menu_player_contract.png");
-  gtk_widget_show (image2663);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image2663);
+  image2704 = create_pixmap (main_window, "menu_player_contract.png");
+  gtk_widget_show (image2704);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image2704);
 
   menu_fire = gtk_image_menu_item_new_with_mnemonic (_("Fire"));
   gtk_widget_show (menu_fire);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_fire);
 
-  image2664 = create_pixmap (main_window, "menu_player_fire.png");
-  gtk_widget_show (image2664);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image2664);
+  image2705 = create_pixmap (main_window, "menu_player_fire.png");
+  gtk_widget_show (image2705);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image2705);
 
   menu_shoots_penalties = gtk_image_menu_item_new_with_mnemonic (_("Shoots penalties"));
   gtk_widget_show (menu_shoots_penalties);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_shoots_penalties);
 
-  image2665 = create_pixmap (main_window, "menu_player_shoots.png");
-  gtk_widget_show (image2665);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image2665);
+  image2706 = create_pixmap (main_window, "menu_player_shoots.png");
+  gtk_widget_show (image2706);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image2706);
 
   menu_move_to_youth_academy = gtk_image_menu_item_new_with_mnemonic (_("Move to youth academy"));
   gtk_widget_show (menu_move_to_youth_academy);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_move_to_youth_academy);
 
-  image2666 = create_pixmap (main_window, "menu_player_move_to_ya.png");
-  gtk_widget_show (image2666);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_move_to_youth_academy), image2666);
+  image2707 = create_pixmap (main_window, "menu_player_move_to_ya.png");
+  gtk_widget_show (image2707);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_move_to_youth_academy), image2707);
+
+  menu_edit_name = gtk_menu_item_new_with_mnemonic (_("Edit name"));
+  gtk_widget_show (menu_edit_name);
+  gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_edit_name);
 
   trennlinie10 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie10);
@@ -833,9 +838,9 @@ create_main_window (void)
   gtk_widget_show (menu_browse_players);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_browse_players);
 
-  image2667 = create_pixmap (main_window, "menu_player_browse.png");
-  gtk_widget_show (image2667);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image2667);
+  image2708 = create_pixmap (main_window, "menu_player_browse.png");
+  gtk_widget_show (image2708);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image2708);
 
   menu_user = gtk_menu_item_new_with_mnemonic (_("_User"));
   gtk_widget_show (menu_user);
@@ -851,9 +856,9 @@ create_main_window (void)
                               GDK_v, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2668 = create_pixmap (main_window, "menu_last_match.png");
-  gtk_widget_show (image2668);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image2668);
+  image2709 = create_pixmap (main_window, "menu_last_match.png");
+  gtk_widget_show (image2709);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image2709);
 
   menu_user_show_last_stats = gtk_image_menu_item_new_with_mnemonic (_("Show last match stats"));
   gtk_widget_show (menu_user_show_last_stats);
@@ -862,9 +867,9 @@ create_main_window (void)
                               GDK_F2, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2669 = create_pixmap (main_window, "menu_match_stats.png");
-  gtk_widget_show (image2669);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image2669);
+  image2710 = create_pixmap (main_window, "menu_match_stats.png");
+  gtk_widget_show (image2710);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image2710);
 
   menu_user_show_coming_matches = gtk_image_menu_item_new_with_mnemonic (_("Show coming matches"));
   gtk_widget_show (menu_user_show_coming_matches);
@@ -873,9 +878,9 @@ create_main_window (void)
                               GDK_F1, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2670 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2670);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image2670);
+  image2711 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2711);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image2711);
 
   trennlinie9 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie9);
@@ -889,9 +894,9 @@ create_main_window (void)
                               GDK_F9, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2671 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2671);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image2671);
+  image2712 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2712);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image2712);
 
   menu_previous_user = gtk_image_menu_item_new_with_mnemonic (_("Previous user"));
   gtk_widget_show (menu_previous_user);
@@ -900,9 +905,9 @@ create_main_window (void)
                               GDK_F8, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2672 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2672);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image2672);
+  image2713 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2713);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image2713);
 
   menu_manage_users = gtk_image_menu_item_new_with_mnemonic (_("Manage users"));
   gtk_widget_show (menu_manage_users);
@@ -911,9 +916,9 @@ create_main_window (void)
                               GDK_F12, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2673 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2673);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image2673);
+  image2714 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2714);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image2714);
 
   menu_finances_stadium = gtk_menu_item_new_with_mnemonic (_("Fin_Stad"));
   gtk_widget_show (menu_finances_stadium);
@@ -929,9 +934,9 @@ create_main_window (void)
                               GDK_f, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2674 = create_pixmap (main_window, "menu_finances.png");
-  gtk_widget_show (image2674);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image2674);
+  image2715 = create_pixmap (main_window, "menu_finances.png");
+  gtk_widget_show (image2715);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image2715);
 
   menu_show_stadium = gtk_image_menu_item_new_with_mnemonic (_("Show stadium"));
   gtk_widget_show (menu_show_stadium);
@@ -940,9 +945,9 @@ create_main_window (void)
                               GDK_f, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2675 = create_pixmap (main_window, "menu_stadium.png");
-  gtk_widget_show (image2675);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image2675);
+  image2716 = create_pixmap (main_window, "menu_stadium.png");
+  gtk_widget_show (image2716);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image2716);
 
   automatic_loan_repayment = gtk_menu_item_new_with_mnemonic (_("Automatic loan repayment"));
   gtk_widget_show (automatic_loan_repayment);
@@ -985,9 +990,9 @@ create_main_window (void)
                               GDK_s, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2676 = create_pixmap (main_window, "menu_league_stats.png");
-  gtk_widget_show (image2676);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image2676);
+  image2717 = create_pixmap (main_window, "menu_league_stats.png");
+  gtk_widget_show (image2717);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image2717);
 
   menu_season_history = gtk_image_menu_item_new_with_mnemonic (_("Season history"));
   gtk_widget_show (menu_season_history);
@@ -996,9 +1001,9 @@ create_main_window (void)
                               GDK_h, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2677 = create_pixmap (main_window, "menu_history.png");
-  gtk_widget_show (image2677);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image2677);
+  image2718 = create_pixmap (main_window, "menu_history.png");
+  gtk_widget_show (image2718);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image2718);
 
   menu_user_show_history = gtk_image_menu_item_new_with_mnemonic (_("User history"));
   gtk_widget_show (menu_user_show_history);
@@ -1007,17 +1012,17 @@ create_main_window (void)
                               GDK_h, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2678 = create_pixmap (main_window, "menu_history.png");
-  gtk_widget_show (image2678);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image2678);
+  image2719 = create_pixmap (main_window, "menu_history.png");
+  gtk_widget_show (image2719);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image2719);
 
   memorable_matches = gtk_image_menu_item_new_with_mnemonic (_("Memorable matches"));
   gtk_widget_show (memorable_matches);
   gtk_container_add (GTK_CONTAINER (stats1_menu), memorable_matches);
 
-  image2679 = create_pixmap (main_window, "menu_mmatches.png");
-  gtk_widget_show (image2679);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image2679);
+  image2720 = create_pixmap (main_window, "menu_mmatches.png");
+  gtk_widget_show (image2720);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image2720);
 
   memorable_matches_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (memorable_matches), memorable_matches_menu);
@@ -1030,9 +1035,9 @@ create_main_window (void)
                               GDK_a, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2680 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2680);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image2680);
+  image2721 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2721);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image2721);
 
   mm_manage_matches = gtk_image_menu_item_new_with_mnemonic (_("Manage matches"));
   gtk_widget_show (mm_manage_matches);
@@ -1042,9 +1047,9 @@ create_main_window (void)
                               GDK_m, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2681 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2681);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image2681);
+  image2722 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2722);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image2722);
 
   menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
   gtk_widget_show (menu_help1);
@@ -1057,25 +1062,25 @@ create_main_window (void)
   gtk_widget_show (menu_about);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_about);
 
-  image2682 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2682);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image2682);
+  image2723 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2723);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image2723);
 
   menu_contributors = gtk_image_menu_item_new_with_mnemonic (_("Contributors"));
   gtk_widget_show (menu_contributors);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_contributors);
 
-  image2683 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2683);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image2683);
+  image2724 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2724);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image2724);
 
   menu_help = gtk_image_menu_item_new_with_mnemonic (_("Help"));
   gtk_widget_show (menu_help);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_help);
 
-  image2684 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2684);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image2684);
+  image2725 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2725);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image2725);
 
   hbox1 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox1);
@@ -1613,6 +1618,9 @@ create_main_window (void)
   g_signal_connect ((gpointer) menu_move_to_youth_academy, "activate",
                     G_CALLBACK (on_menu_move_to_youth_academy_activate),
                     NULL);
+  g_signal_connect ((gpointer) menu_edit_name, "activate",
+                    G_CALLBACK (on_menu_edit_name_activate),
+                    NULL);
   g_signal_connect ((gpointer) menu_browse_players, "activate",
                     G_CALLBACK (on_menu_browse_players_activate),
                     NULL);
@@ -1740,7 +1748,7 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_new, "menu_new");
   GLADE_HOOKUP_OBJECT (main_window, menu_open, "menu_open");
   GLADE_HOOKUP_OBJECT (main_window, menu_load_last_save, "menu_load_last_save");
-  GLADE_HOOKUP_OBJECT (main_window, image2643, "image2643");
+  GLADE_HOOKUP_OBJECT (main_window, image2684, "image2684");
   GLADE_HOOKUP_OBJECT (main_window, menu_save, "menu_save");
   GLADE_HOOKUP_OBJECT (main_window, menu_save_as, "menu_save_as");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie1, "trennlinie1");
@@ -1748,30 +1756,30 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_options, "menu_options");
   GLADE_HOOKUP_OBJECT (main_window, menu_options_menu, "menu_options_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_preferences, "menu_preferences");
-  GLADE_HOOKUP_OBJECT (main_window, image2644, "image2644");
+  GLADE_HOOKUP_OBJECT (main_window, image2685, "image2685");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie7, "trennlinie7");
   GLADE_HOOKUP_OBJECT (main_window, menu_job_offers, "menu_job_offers");
   GLADE_HOOKUP_OBJECT (main_window, menu_live_game, "menu_live_game");
   GLADE_HOOKUP_OBJECT (main_window, menu_overwrite, "menu_overwrite");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie14, "trennlinie14");
   GLADE_HOOKUP_OBJECT (main_window, menu_save_window_geometry, "menu_save_window_geometry");
-  GLADE_HOOKUP_OBJECT (main_window, image2645, "image2645");
+  GLADE_HOOKUP_OBJECT (main_window, image2686, "image2686");
   GLADE_HOOKUP_OBJECT (main_window, menu_figures, "menu_figures");
   GLADE_HOOKUP_OBJECT (main_window, menu_figures_menu, "menu_figures_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_fixtures_week, "menu_fixtures_week");
-  GLADE_HOOKUP_OBJECT (main_window, image2646, "image2646");
+  GLADE_HOOKUP_OBJECT (main_window, image2687, "image2687");
   GLADE_HOOKUP_OBJECT (main_window, menu_fixtures, "menu_fixtures");
-  GLADE_HOOKUP_OBJECT (main_window, image2647, "image2647");
+  GLADE_HOOKUP_OBJECT (main_window, image2688, "image2688");
   GLADE_HOOKUP_OBJECT (main_window, menu_tables, "menu_tables");
-  GLADE_HOOKUP_OBJECT (main_window, image2648, "image2648");
+  GLADE_HOOKUP_OBJECT (main_window, image2689, "image2689");
   GLADE_HOOKUP_OBJECT (main_window, menu_my_league_results, "menu_my_league_results");
-  GLADE_HOOKUP_OBJECT (main_window, image2649, "image2649");
+  GLADE_HOOKUP_OBJECT (main_window, image2690, "image2690");
   GLADE_HOOKUP_OBJECT (main_window, menu_season_results, "menu_season_results");
-  GLADE_HOOKUP_OBJECT (main_window, image2650, "image2650");
+  GLADE_HOOKUP_OBJECT (main_window, image2691, "image2691");
   GLADE_HOOKUP_OBJECT (main_window, menu_team, "menu_team");
   GLADE_HOOKUP_OBJECT (main_window, menu_team_menu, "menu_team_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_playing_style, "menu_playing_style");
-  GLADE_HOOKUP_OBJECT (main_window, image2651, "image2651");
+  GLADE_HOOKUP_OBJECT (main_window, image2692, "image2692");
   GLADE_HOOKUP_OBJECT (main_window, menu_playing_style_menu, "menu_playing_style_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_all_out_defend, "menu_all_out_defend");
   GLADE_HOOKUP_OBJECT (main_window, menu_defend, "menu_defend");
@@ -1779,21 +1787,21 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_attack, "menu_attack");
   GLADE_HOOKUP_OBJECT (main_window, menu_all_out_attack, "menu_all_out_attack");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout, "menu_scout");
-  GLADE_HOOKUP_OBJECT (main_window, image2652, "image2652");
+  GLADE_HOOKUP_OBJECT (main_window, image2693, "image2693");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_menu, "menu_scout_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_best, "menu_scout_best");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_good, "menu_scout_good");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_average, "menu_scout_average");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_bad, "menu_scout_bad");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio, "menu_physio");
-  GLADE_HOOKUP_OBJECT (main_window, image2653, "image2653");
+  GLADE_HOOKUP_OBJECT (main_window, image2694, "image2694");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_menu, "menu_physio_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_best, "menu_physio_best");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_good, "menu_physio_good");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_average, "menu_physio_average");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_bad, "menu_physio_bad");
   GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy, "menu_youth_academy");
-  GLADE_HOOKUP_OBJECT (main_window, image2654, "image2654");
+  GLADE_HOOKUP_OBJECT (main_window, image2695, "image2695");
   GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy_menu, "menu_youth_academy_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_youth_academy, "menu_show_youth_academy");
   GLADE_HOOKUP_OBJECT (main_window, youth_coach1, "youth_coach1");
@@ -1811,7 +1819,7 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_recruit4, "menu_recruit4");
   GLADE_HOOKUP_OBJECT (main_window, menu_set_investment, "menu_set_investment");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost, "menu_boost");
-  GLADE_HOOKUP_OBJECT (main_window, image2655, "image2655");
+  GLADE_HOOKUP_OBJECT (main_window, image2696, "image2696");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost_menu, "menu_boost_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost_on, "menu_boost_on");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost_off, "menu_boost_off");
@@ -1820,56 +1828,57 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_training_camp, "menu_training_camp");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie18, "trennlinie18");
   GLADE_HOOKUP_OBJECT (main_window, menu_reset_players, "menu_reset_players");
-  GLADE_HOOKUP_OBJECT (main_window, image2656, "image2656");
+  GLADE_HOOKUP_OBJECT (main_window, image2697, "image2697");
   GLADE_HOOKUP_OBJECT (main_window, menu_custom_structure, "menu_custom_structure");
-  GLADE_HOOKUP_OBJECT (main_window, image2657, "image2657");
+  GLADE_HOOKUP_OBJECT (main_window, image2698, "image2698");
   GLADE_HOOKUP_OBJECT (main_window, menu_rearrange_team, "menu_rearrange_team");
-  GLADE_HOOKUP_OBJECT (main_window, image2658, "image2658");
+  GLADE_HOOKUP_OBJECT (main_window, image2699, "image2699");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie8, "trennlinie8");
   GLADE_HOOKUP_OBJECT (main_window, menu_browse_teams, "menu_browse_teams");
-  GLADE_HOOKUP_OBJECT (main_window, image2659, "image2659");
+  GLADE_HOOKUP_OBJECT (main_window, image2700, "image2700");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie16, "trennlinie16");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_job_exchange, "menu_show_job_exchange");
   GLADE_HOOKUP_OBJECT (main_window, menu_player, "menu_player");
   GLADE_HOOKUP_OBJECT (main_window, menu_player_menu, "menu_player_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_info, "menu_show_info");
-  GLADE_HOOKUP_OBJECT (main_window, image2660, "image2660");
+  GLADE_HOOKUP_OBJECT (main_window, image2701, "image2701");
   GLADE_HOOKUP_OBJECT (main_window, menu_put_on_transfer_list, "menu_put_on_transfer_list");
-  GLADE_HOOKUP_OBJECT (main_window, image2661, "image2661");
+  GLADE_HOOKUP_OBJECT (main_window, image2702, "image2702");
   GLADE_HOOKUP_OBJECT (main_window, menu_remove_from_transfer_list, "menu_remove_from_transfer_list");
-  GLADE_HOOKUP_OBJECT (main_window, image2662, "image2662");
+  GLADE_HOOKUP_OBJECT (main_window, image2703, "image2703");
   GLADE_HOOKUP_OBJECT (main_window, menu_offer_new_contract, "menu_offer_new_contract");
-  GLADE_HOOKUP_OBJECT (main_window, image2663, "image2663");
+  GLADE_HOOKUP_OBJECT (main_window, image2704, "image2704");
   GLADE_HOOKUP_OBJECT (main_window, menu_fire, "menu_fire");
-  GLADE_HOOKUP_OBJECT (main_window, image2664, "image2664");
+  GLADE_HOOKUP_OBJECT (main_window, image2705, "image2705");
   GLADE_HOOKUP_OBJECT (main_window, menu_shoots_penalties, "menu_shoots_penalties");
-  GLADE_HOOKUP_OBJECT (main_window, image2665, "image2665");
+  GLADE_HOOKUP_OBJECT (main_window, image2706, "image2706");
   GLADE_HOOKUP_OBJECT (main_window, menu_move_to_youth_academy, "menu_move_to_youth_academy");
-  GLADE_HOOKUP_OBJECT (main_window, image2666, "image2666");
+  GLADE_HOOKUP_OBJECT (main_window, image2707, "image2707");
+  GLADE_HOOKUP_OBJECT (main_window, menu_edit_name, "menu_edit_name");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie10, "trennlinie10");
   GLADE_HOOKUP_OBJECT (main_window, menu_browse_players, "menu_browse_players");
-  GLADE_HOOKUP_OBJECT (main_window, image2667, "image2667");
+  GLADE_HOOKUP_OBJECT (main_window, image2708, "image2708");
   GLADE_HOOKUP_OBJECT (main_window, menu_user, "menu_user");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_menu, "menu_user_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_match, "menu_user_show_last_match");
-  GLADE_HOOKUP_OBJECT (main_window, image2668, "image2668");
+  GLADE_HOOKUP_OBJECT (main_window, image2709, "image2709");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_stats, "menu_user_show_last_stats");
-  GLADE_HOOKUP_OBJECT (main_window, image2669, "image2669");
+  GLADE_HOOKUP_OBJECT (main_window, image2710, "image2710");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_coming_matches, "menu_user_show_coming_matches");
-  GLADE_HOOKUP_OBJECT (main_window, image2670, "image2670");
+  GLADE_HOOKUP_OBJECT (main_window, image2711, "image2711");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie9, "trennlinie9");
   GLADE_HOOKUP_OBJECT (main_window, menu_next_user, "menu_next_user");
-  GLADE_HOOKUP_OBJECT (main_window, image2671, "image2671");
+  GLADE_HOOKUP_OBJECT (main_window, image2712, "image2712");
   GLADE_HOOKUP_OBJECT (main_window, menu_previous_user, "menu_previous_user");
-  GLADE_HOOKUP_OBJECT (main_window, image2672, "image2672");
+  GLADE_HOOKUP_OBJECT (main_window, image2713, "image2713");
   GLADE_HOOKUP_OBJECT (main_window, menu_manage_users, "menu_manage_users");
-  GLADE_HOOKUP_OBJECT (main_window, image2673, "image2673");
+  GLADE_HOOKUP_OBJECT (main_window, image2714, "image2714");
   GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium, "menu_finances_stadium");
   GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium_menu, "menu_finances_stadium_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_finances, "menu_show_finances");
-  GLADE_HOOKUP_OBJECT (main_window, image2674, "image2674");
+  GLADE_HOOKUP_OBJECT (main_window, image2715, "image2715");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_stadium, "menu_show_stadium");
-  GLADE_HOOKUP_OBJECT (main_window, image2675, "image2675");
+  GLADE_HOOKUP_OBJECT (main_window, image2716, "image2716");
   GLADE_HOOKUP_OBJECT (main_window, automatic_loan_repayment, "automatic_loan_repayment");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie15, "trennlinie15");
   GLADE_HOOKUP_OBJECT (main_window, menu_betting, "menu_betting");
@@ -1877,26 +1886,26 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, stats1_menu, "stats1_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_news, "menu_news");
   GLADE_HOOKUP_OBJECT (main_window, menu_league_stats, "menu_league_stats");
-  GLADE_HOOKUP_OBJECT (main_window, image2676, "image2676");
+  GLADE_HOOKUP_OBJECT (main_window, image2717, "image2717");
   GLADE_HOOKUP_OBJECT (main_window, menu_season_history, "menu_season_history");
-  GLADE_HOOKUP_OBJECT (main_window, image2677, "image2677");
+  GLADE_HOOKUP_OBJECT (main_window, image2718, "image2718");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_history, "menu_user_show_history");
-  GLADE_HOOKUP_OBJECT (main_window, image2678, "image2678");
+  GLADE_HOOKUP_OBJECT (main_window, image2719, "image2719");
   GLADE_HOOKUP_OBJECT (main_window, memorable_matches, "memorable_matches");
-  GLADE_HOOKUP_OBJECT (main_window, image2679, "image2679");
+  GLADE_HOOKUP_OBJECT (main_window, image2720, "image2720");
   GLADE_HOOKUP_OBJECT (main_window, memorable_matches_menu, "memorable_matches_menu");
   GLADE_HOOKUP_OBJECT (main_window, mm_add_last_match, "mm_add_last_match");
-  GLADE_HOOKUP_OBJECT (main_window, image2680, "image2680");
+  GLADE_HOOKUP_OBJECT (main_window, image2721, "image2721");
   GLADE_HOOKUP_OBJECT (main_window, mm_manage_matches, "mm_manage_matches");
-  GLADE_HOOKUP_OBJECT (main_window, image2681, "image2681");
+  GLADE_HOOKUP_OBJECT (main_window, image2722, "image2722");
   GLADE_HOOKUP_OBJECT (main_window, menu_help1, "menu_help1");
   GLADE_HOOKUP_OBJECT (main_window, menu_help1_menu, "menu_help1_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_about, "menu_about");
-  GLADE_HOOKUP_OBJECT (main_window, image2682, "image2682");
+  GLADE_HOOKUP_OBJECT (main_window, image2723, "image2723");
   GLADE_HOOKUP_OBJECT (main_window, menu_contributors, "menu_contributors");
-  GLADE_HOOKUP_OBJECT (main_window, image2683, "image2683");
+  GLADE_HOOKUP_OBJECT (main_window, image2724, "image2724");
   GLADE_HOOKUP_OBJECT (main_window, menu_help, "menu_help");
-  GLADE_HOOKUP_OBJECT (main_window, image2684, "image2684");
+  GLADE_HOOKUP_OBJECT (main_window, image2725, "image2725");
   GLADE_HOOKUP_OBJECT (main_window, hbox1, "hbox1");
   GLADE_HOOKUP_OBJECT (main_window, button_load, "button_load");
   GLADE_HOOKUP_OBJECT (main_window, image11, "image11");
@@ -1988,6 +1997,7 @@ create_menu_player (void)
   GtkWidget *player_menu_fire;
   GtkWidget *player_menu_shoots_penalties;
   GtkWidget *player_menu_move_to_youth_academy;
+  GtkWidget *player_menu_edit_name;
 
   menu_player = gtk_menu_new ();
 
@@ -2019,6 +2029,10 @@ create_menu_player (void)
   gtk_widget_show (player_menu_move_to_youth_academy);
   gtk_container_add (GTK_CONTAINER (menu_player), player_menu_move_to_youth_academy);
 
+  player_menu_edit_name = gtk_menu_item_new_with_mnemonic (_("Edit name"));
+  gtk_widget_show (player_menu_edit_name);
+  gtk_container_add (GTK_CONTAINER (menu_player), player_menu_edit_name);
+
   g_signal_connect ((gpointer) player_menu_show_info, "activate",
                     G_CALLBACK (on_player_menu_show_info_activate),
                     NULL);
@@ -2040,6 +2054,9 @@ create_menu_player (void)
   g_signal_connect ((gpointer) player_menu_move_to_youth_academy, "activate",
                     G_CALLBACK (on_player_menu_move_to_youth_academy_activate),
                     NULL);
+  g_signal_connect ((gpointer) player_menu_edit_name, "activate",
+                    G_CALLBACK (on_player_menu_edit_name_activate),
+                    NULL);
 
   /* Store pointers to all widgets, for use by lookup_widget(). */
   GLADE_HOOKUP_OBJECT_NO_REF (menu_player, menu_player, "menu_player");
@@ -2050,6 +2067,7 @@ create_menu_player (void)
   GLADE_HOOKUP_OBJECT (menu_player, player_menu_fire, "player_menu_fire");
   GLADE_HOOKUP_OBJECT (menu_player, player_menu_shoots_penalties, "player_menu_shoots_penalties");
   GLADE_HOOKUP_OBJECT (menu_player, player_menu_move_to_youth_academy, "player_menu_move_to_youth_academy");
+  GLADE_HOOKUP_OBJECT (menu_player, player_menu_edit_name, "player_menu_edit_name");
 
   return menu_player;
 }