MP-363 #comment Refactor, make form rendering driven by the form definition