Fixed URLS to use BASE_URL