Jaya| Fixed form section and add fields
Merging the pull request