Form fixes and changes in one commit

Form fixes and changes in one commit