Moved a bunch of layout values to styles.
Merge branch 'master' of https://github.com/cmuellerrr/PEER.git