Merge pull request #20 from peter-tackage/layout-and-design

Layout and design