More tinkering with layouts
another tweak