Added CSS to events select page
Fixed merge conflict
Fixed merge conflicts