Move contact button / redesign EventAdd cmp

also refactor form