Major update with new nav