Merge pull request #3 from duncangrant/feature/cleanup-layout

Feature/cleanup layout
Merge remote-tracking branch 'origin/master' into feature/cleanup-layout