Working on event add page
merged
some stuff