CSS bug and added activity constants
Merge branch 'master' of https://github.com/UnicycleLabs/intouch