Slight rework on menu