diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index c6fcbfd87..7c4f6b8fa 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -7,9 +7,9 @@
 <div class="row">
     <div class="col-md-9">
         <ol class="breadcrumb">
-            <li><a href="{% url 'dcim:site' slug=circuit.site.slug %}">{{ circuit.site }}</a></li>
-            <li><a href="{% url 'circuits:circuit_list' %}?site={{ circuit.site.slug }}">Circuits</a></li>
-            <li>{{ circuit }}</li>
+            <li><a href="{% url 'circuits:circuit_list' %}">Circuits</a></li>
+            <li><a href="{% url 'circuits:circuit_list' %}?provider={{ circuit.provider.slug }}">{{ circuit.provider }}</a></li>
+            <li>{{ circuit.cid }}</li>
         </ol>
     </div>
     <div class="col-md-3">
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 93df009b9..d5928e1c7 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -8,8 +8,8 @@
 <div class="row">
     <div class="col-md-9">
         <ol class="breadcrumb">
-            <li><a href="{% url 'dcim:site' slug=rack.site.slug %}">{{ rack.site }}</a></li>
-            <li><a href="{% url 'dcim:rack_list' %}?site={{ rack.site.slug }}">Racks</a></li>
+            <li><a href="{% url 'dcim:rack_list' %}">Racks</a></li>
+            <li><a href="{% url 'dcim:rack_list' %}?site={{ rack.site.slug }}">{{ rack.site }}</a></li>
             <li>{{ rack }}</li>
         </ol>
     </div>
diff --git a/netbox/templates/ipam/inc/prefix_header.html b/netbox/templates/ipam/inc/prefix_header.html
index 8bbdfe055..5c3896884 100644
--- a/netbox/templates/ipam/inc/prefix_header.html
+++ b/netbox/templates/ipam/inc/prefix_header.html
@@ -1,11 +1,9 @@
 <div class="row">
     <div class="col-md-9">
         <ol class="breadcrumb">
-            {% if prefix.site %}
-                <li><a href="{% url 'dcim:site' slug=prefix.site.slug %}">{{ prefix.site }}</a></li>
-                <li><a href="{% url 'ipam:prefix_list' %}?site={{ prefix.site.slug }}">Prefixes</a></li>
-            {% else %}
-                <li><a href="{% url 'ipam:prefix_list' %}">Prefixes</a></li>
+            <li><a href="{% url 'ipam:prefix_list' %}">Prefixes</a></li>
+            {% if prefix.vrf %}
+                <li><a href="{% url 'ipam:prefix_list' %}?vrf={{ prefix.vrf.pk }}">{{ prefix.vrf }}</a></li>
             {% endif %}
             <li>{{ prefix }}</li>
         </ol>
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 9112707a7..9c283e917 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -7,12 +7,11 @@
 <div class="row">
     <div class="col-md-9">
         <ol class="breadcrumb">
-            {% for p in parent_prefixes %}
-                <li><a href="{% url 'ipam:prefix' pk=p.pk %}">{{ p }}</a></li>
-            {% empty %}
-                <li><a href="{% url 'ipam:ipaddress_list' %}">IP Addresses</a></li>
-            {% endfor %}
-            <li>{{ ipaddress.address.ip }}</li>
+            <li><a href="{% url 'ipam:ipaddress_list' %}">IP Addresses</a></li>
+            {% if ipaddress.vrf %}
+                <li><a href="{% url 'ipam:ipaddress_list' %}?vrf={{ ipaddress.vrf.pk }}">{{ ipaddress.vrf }}</a></li>
+            {% endif %}
+            <li>{{ ipaddress }}</li>
         </ol>
     </div>
     <div class="col-md-3">
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index cf525ff58..9555a6ea9 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -7,8 +7,11 @@
 <div class="row">
     <div class="col-md-9">
         <ol class="breadcrumb">
-            <li><a href="{% url 'dcim:site' slug=vlan.site.slug %}">{{ vlan.site }}</a></li>
-            <li><a href="{% url 'ipam:vlan_list' %}?site={{ vlan.site.slug }}">VLANs</a></li>
+            <li><a href="{% url 'ipam:vlan_list' %}">VLANs</a></li>
+            <li><a href="{% url 'ipam:vlan_list' %}?site={{ vlan.site.slug }}">{{ vlan.site }}</a></li>
+            {% if vlan.group %}
+                <li><a href="{% url 'ipam:vlan_list' %}?site={{ vlan.site.slug }}&group={{ vlan.group.slug }}">{{ vlan.group.name }}</a></li>
+            {% endif %}
             <li>{{ vlan.name }} ({{ vlan.vid }})</li>
         </ol>
     </div>
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index 948ee1d89..8a8f67c9b 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -4,6 +4,26 @@
 {% block title %}VRF {{ vrf }}{% endblock %}
 
 {% block content %}
+<div class="row">
+    <div class="col-md-9">
+        <ol class="breadcrumb">
+            <li><a href="{% url 'ipam:vrf_list' %}">VRFs</a></li>
+            <li>{{ vrf }}</li>
+        </ol>
+    </div>
+    <div class="col-md-3">
+        <form action="{% url 'ipam:vrf_list' %}" method="get">
+            <div class="input-group">
+                <input type="text" name="name" class="form-control" placeholder="VRF name" />
+                <span class="input-group-btn">
+                    <button type="submit" class="btn btn-primary">
+                        <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+                    </button>
+                </span>
+            </div>
+        </form>
+    </div>
+</div>
 <div class="pull-right">
     {% if perms.ipam.change_vrf %}
         <a href="{% url 'ipam:vrf_edit' pk=vrf.pk %}" class="btn btn-warning">
diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html
index e98030c9a..953d6bcd0 100644
--- a/netbox/templates/secrets/secret.html
+++ b/netbox/templates/secrets/secret.html
@@ -9,8 +9,8 @@
     <div class="col-md-12">
         <ol class="breadcrumb">
             <li><a href="{% url 'secrets:secret_list' %}">Secrets</a></li>
-            <li><a href="{% url 'dcim:device' pk=secret.device.pk %}">{{ secret.device }}</a></li>
-            <li>{{ secret.role }}{% if secret.name %} ({{ secret.name }}){% endif %}</li>
+            <li><a href="{% url 'secrets:secret_list' %}?role={{ secret.role.slug }}">{{ secret.role }}</a></li>
+            <li>{{ secret.device }}{% if secret.name %} ({{ secret.name }}){% endif %}</li>
         </ol>
     </div>
 </div>
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index a12ed8fa8..fdeae4af7 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -7,6 +7,7 @@
 <div class="row">
     <div class="col-md-9">
         <ol class="breadcrumb">
+            <li><a href="{% url 'tenancy:tenant_list' %}">Tenants</a></li>
             <li><a href="{% url 'tenancy:tenant_list' %}?group={{ tenant.group.slug }}">{{ tenant.group }}</a></li>
             <li>{{ tenant }}</li>
         </ol>