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