Refactor to use Router to manage menu selection.