Updated more urls to use baseurl