Changed the names of some of the sub-modal methods / properties. Updated form view save.