Polished up form.

- Data now populates form based on form type