Thank you page using templates, templates functionality improved