Merge pull request #6 from melodylhsy/master

Revised event list view