Feature/template adjustment

Trivial changes in default templates.

I felt uneasy to them.