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