Merge pull request #28 from zerebubuth/routing-ui-tweaks-2