Fix menu navigation