Some minor changes to use 'url' macro in templates more consistently for deployment.