diff --git a/puppetboard/app.py b/puppetboard/app.py
index 14689c7..a449a99 100644
--- a/puppetboard/app.py
+++ b/puppetboard/app.py
@@ -4,6 +4,7 @@ from __future__ import absolute_import
 import os
 import logging
 import collections
+import urllib
 
 from flask import (
     Flask, render_template, abort, url_for,
@@ -206,5 +207,6 @@ def metrics():
 
 @app.route('/metric/<metric>')
 def metric(metric):
+  name = urllib.unquote(metric)
   metric = puppetdb.metric(metric)
-  return render_template('metric.html', metric=sorted(metric.items()))
+  return render_template('metric.html', name=name, metric=sorted(metric.items()))
diff --git a/puppetboard/templates/metric.html b/puppetboard/templates/metric.html
index 17f60cf..b061b27 100644
--- a/puppetboard/templates/metric.html
+++ b/puppetboard/templates/metric.html
@@ -1,6 +1,10 @@
 {% extends 'layout.html' %}
 {% block content %}
-<h1>Metric</h1>
+<div class="page-header">
+  <h1>Metric
+    <small>{{name}}</small>
+  </h1>
+</div>
 <table class="table table-striped">
   <tbody>
     {% for key,value in metric %}