fixed rendering and routes