Improved overall site design