More changes in templates style