Merged the 2 LayoutPick types into a single type