Remove JB
fix stuff
Merge pull request #3 from duncangrant/feature/cleanup-layout

Feature/cleanup layout