Changed to work with CGExtensions 1.8<br />Minor template fixes.