Merge pull request #323 from martflu/urls

some more urls beautification
Merge pull request #324 from martflu/urls

more urls
Merge pull request #325 from martflu/urls

Urls