Fixed settings and layout

The files got some extra lines from gits attempt at merging.
test
Merge branch 'master' of https://github.com/vonbob/Fall_Prevention_2013