Reworked the URLs a bit more