Use addevent page for editing too
Small UI fixes