diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html
index 8b2fa4857..2fb0d8ac6 100644
--- a/netbox/templates/_base.html
+++ b/netbox/templates/_base.html
@@ -44,7 +44,7 @@
                             {% endif %}
                         </ul>
                     </li>
-                    <li class="dropdown{% if '/devices/' in request.path or '/device-types/' in request.path or '-connections/' in request.path %} active{% endif %}">
+                    <li class="dropdown{% if '/devices/' in request.path or '/device-types/' in request.path or '/device-roles/' in request.path or '-connections/' in request.path %} active{% endif %}">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Devices <span class="caret"></span></a>
                         <ul class="dropdown-menu">
                             <li><a href="{% url 'dcim:device_list' %}"><i class="glyphicon glyphicon-search" aria-hidden="true"></i> Devices</a></li>
@@ -56,9 +56,16 @@
                                 <li class="divider"></li>
                             {% endif %}
                             <li><a href="{% url 'dcim:devicetype_list' %}"><i class="glyphicon glyphicon-search" aria-hidden="true"></i> Device Types</a></li>
-                            {% if perms.dcim.add_device %}
+                            {% if perms.dcim.add_devicetype %}
                                 <li><a href="{% url 'dcim:devicetype_add' %}"><i class="glyphicon glyphicon-plus" aria-hidden="true"></i> Add a Device Type</a></li>
                             {% endif %}
+                            {% if perms.ipam.add_devicetype or perms.ipam.add_devicerole %}
+                                <li class="divider"></li>
+                            {% endif %}
+                            <li><a href="{% url 'dcim:devicerole_list' %}"><i class="glyphicon glyphicon-search" aria-hidden="true"></i> Device Roles</a></li>
+                            {% if perms.dcim.add_devicerole %}
+                                <li><a href="{% url 'dcim:devicerole_add' %}"><i class="glyphicon glyphicon-plus" aria-hidden="true"></i> Add a Device Role</a></li>
+                            {% endif %}
                             <li class="divider"></li>
                             <li><a href="{% url 'dcim:console_connections_list' %}"><i class="glyphicon glyphicon-search" aria-hidden="true"></i> Console Connections</a></li>
                             {% if perms.dcim.change_consoleport %}