Change Create event page
Solve merge conflict on merge with branch 149