Routing improvements across the site