diff --git a/mediagoblin/templates/mediagoblin/utils/license.html b/mediagoblin/templates/mediagoblin/utils/license.html
index 2438ed4e..ab157508 100644
--- a/mediagoblin/templates/mediagoblin/utils/license.html
+++ b/mediagoblin/templates/mediagoblin/utils/license.html
@@ -17,8 +17,8 @@
#}
{% block license_content -%}
+
{% trans %}License{% endtrans %}
- {% trans %}License:{% endtrans %}
{% if media.license %}
{{ media.get_license_data().abbreviation }}
{% else %}
diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index 6408102d..bcf3b5fd 100644
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -17,16 +17,17 @@
#}
{% block tags_content -%}
-
{% trans %}View more media tagged with{% endtrans %}
+
Tagged with
+
{% for tag in media.tags %}
{% if loop.last %}
{# the 'and' should only appear if there is more than one tag #}
{% if media.tags|length > 1 %}
- {% trans %}or{% endtrans %}
+ ·
{% endif %}
{{ tag['name'] }}.
+ tag=tag['slug']) }}">{{ tag['name'] }}
{% elif loop.revindex == 2 %}
{{ tag['name'] }},
+ tag=tag['slug']) }}">{{ tag['name'] }} ·
{% endif %}
{% endfor %}