Further improvements to the site layout