Restyled forms
Merge conflicts for form