Updated fields on views and design
Merge branch 'master' of https://github.com/AkermanGreg/happy

Updates to fields on views and design