[Core] - Routing tweaks, now renders