Some small layout tweaks