Tidied up the urls