Added form mangler and updated template