Cleaning up site layout