styling on forms
fixed conflicts