General templating and routing changes