Formatting cleaned up, need to put required fields on forms.