further layout tinkering