Cleaned up forms to be more consistent with style and usability