Updates to form rendering for margin info