More fixes to small layout