few little changes to main menu
fixed conflicts