More layout tinkering.