A few small layout tweaks