Fix back nav with new menu system