Fixing urls. This needs rethought