Adding form styles
Cleaned up wufoo form
Resolved conflicts
merge from mike