Changed the url structure, to make them prettier