improvements to sitelayout