Install in a single run of cabal to ensure a coherent set of dependency versions
Fix test cases to handler merged LayoutPick type
Reorganised Layout to remove code duplication and make organisation cleaner