Add in some styles to clean up the forms.
Fix copy.
Resolve merge.
Resolve merge.