Fixing conflicts
Added events and styles
Batch changes
Fixed merge conflicts