only an integer number of events based on screen size
fix icons
conlficts
Merge pull request #132 from adicu/events-cleanup

Events cleanup