Form fixes and changes in one commit