Added the next activity and fixed more layout stuff.
Merge branch 'master' of https://github.com/ashinskyd/GamifyHealth