added templates and working on UI