Refactored the form viewer to coincide with the changes made to the form builder.