Some url adjustments in templates