fixed #61 and more UI changes
Merge pull request #65 from AndroidTresLeches/event_feature

fixed #61 and more UI changes