Switched routing mechanism, small UI tweaks