Some style changes, and a change so that it says observation if there is only 1
Merge branch 'develop' of https://github.com/avalanchedotca/CACMobile into develop
Merge branch 'develop' of https://github.com/avalanchedotca/CACMobile into develop