More layout fiddling.