61 url enhancements

Here's the pull request for the URL enhancements project. I fixed all the conflicts from the first merge and added a few more changes to some templates. This pull request can be merged now.