Better grouping of activities

Fix #2, #1 

:construction: