Cleanup links and convert to {% url %} in places that have been missed

Fixes #139