Some small layout changes