Updated menu selection logic
Updated menu save function