Improvements to form editor presentation
re-add fots
Merge branch 'redesign' into map-list-fix