improved the template

please review the improvements and let me know if you have any suggestions