Fleshed out layout and refactored tests
Merge pull request #2 from witbok/filling-in-layout

Fleshed out layout and refactored tests