Sync up with latest horizon nav changes