Improve urls, add redirects