Modified nutrition and diary pages to ensure consistency.
Merge branch 'develop' of https://github.com/guydude1727/ria into develop
Updated files so that span tags would be changed to button tag.