Site Layout improvements