Cleaning up the ui a little bit
'
Merge pull request #43 from vinitcool76/feature/template-enhance

Cleaning up the ui a little bit