More fiddling with layouts (wip)