Several Layout improvements.