Refactor menu navigation, allow direct access to tab