Event Design
Merge pull request #74 from lukaswelte/Event-Design

Event Design
fix Button
Friends Button + minor changes
Merge pull request #75 from lukaswelte/Design-Stuff

Friends Button + minor changes
Merge branch 'master' into fix/variousRefactoringAndFixes