1. Show 1:1 sub-forms as inline forms. 2. Changed print logic to be more object-oriented