Improve urls
Merge branch 'betterUrls'