Fixing conflicts
Added events and styles
Batch changes
Fixed merge conflicts
Fixed CSS errors
Merge branch 'master' into CandidatePage