Feature/angular templates