Improved templates
General improvements