Layout improvements.