Created create/edit event pages, resolved minor issues (re-pull)