refactored render names and embedded models in view