Additional layout improvements.