Fixed routing/url/link issues