more robust menu/mode transitions