Improved site layout