Jaya| Fixed form section and add fields
Merging the pull request
jaya|resolved conflicts for add custom field feature