Imroved site layout