lots of layout done
Merge pull request #14 from olliegill/ollie