Diddling with the layout some more