MP-434 #comment Update HTML rendering of form