minor fixes to menu logic