Merged events to admin - fixed general look and feel