Some more marginal layout changes.