various fixes for new nav