1. Implemented inline rendering mechanism for 1:1 sub-forms 2. Changed print logic to be more object oriented to accomodate fancy controls