I'm doing the routing menu modification at once with merging your changes - I've changed quite a lot in the end, so I'll push it once it works again.

I normally try to push as often as possible, so this is something of an exception.

Thanks, I'll add it in.