Change some details with data structure. Add badges on events.
Merge origin/master