Changes according to new models
Added UI-bootstrap with template support