minor form styling and text changes
merge conflict resolved, I hope