UI changed
Merge branch 'master' of https://github.com/codeplan/Ideadu-Health