made lots of styling changes to forms
Merge branch 'PeggyBranch'