And more changes in templates style

...and some cleaning