add style to event edit page
fix merge conflict