layout
Merge pull request #21 from TomHAnderson/layout

layout