Further navigation and url fixes