layout polishing in progres

pre-merge commit
Attempt at salvaging the merge messup

removed some conflicts by hand, not sure how well that turned out...
Merge pull request #8 from saekort/layout

Layout