Changes made on various forms

Please include the pull request in the code base