more fiddling with layout