cleaned up many of the views so that the form is more clear