Remove JB
Merge pull request #2 from duncangrant/feature/cleanup-layout

Remove JB