Fixed event page div
Merged changes