fixes in forms
fixes
fixes
Fix of #260
Merge pull request #262 from microweber/develop

Fixes