Enhancements

Template can be overriden in customers html