Pretty-print form layouts

This enables sane diff, helps especially when working collaboratively.
Get rid of wrapping elements
Merge pull request #313 from plomino/jean-pretty-layout

Jean pretty layout