Add some style
Merge branch 'feature/template'