better the template

Template enhancements.