More tweaks and rationalisation of routing/urls