Main Menu rework