More form changes
Merge branch 'master' of https://github.com/nirb89/cloudclass