Major update with new nav v2