[PD-844] Updated the Company Profile model and form

Under-estimated myself. This took way less time than I originally thought. 
Should I promote this to the FormViewBase class?