Tidy-ups and fixes to TileLayout