New layout for sites and wells