#53 Fixing display/generation of URLs in UI.