Merge pull request #59 from AndroidTresLeches/event_feature

Event feature
fixed #61 and more UI changes