Prefill forms
Fix form bugs
Back url and layout fix
Merge pull request #774 from erwinwinder/master

Form bug fixes and improvements