A few layout changes.