Added boostrap styling to forms
Code clean up and css touch up