Ffixed the url issues and formating