fixed horizontal edit form, spacing and user divs
fixed conflicts