WIP: Refactor menu_selector.