[GAIA BUG946750-FORM] - change way edit form is displayed
Merge pull request #406 from michalbe/Bug946750-form-temp

[GAIA BUG946750-FORM] - change way edit form is displayed