Some style changes
Add templates management