Updated and fixed the Urls