Fixed events dropdown
fixed merge conflicts