styling on labels, footer, etc.
fixed merge conflict
Merge branch 'develop' of https://github.com/soolaimon/mobile_noms into develop

sh