modal styling
merge conflict in form partials