Further layout improvements.