Improved template spacing