Some layout changes.
.