Make a number of small layout improvements