improved rendering/routing