Improve trust form template