Layout for Settings done, layout for per person entry revised for alignment
Merge branch 'master' of https://github.com/js3611/WebApp