Tidy up urls a bit