activities now displays for first type
Merge branch 'master' of github.com:beak-lab/swell