Main Menu rework

Comment here explaining why this is commented out