Made the validation-function configuration item a JSON object so we can pass variables through to the template
Added support for form-layout configuration item