Merge pull request #139 from clacote/older-events-display

Older events display
Merge pull request #140 from clacote/bug-fixes

Bug fixes