Minor changes to menu, working on timers.