diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html
index 2b95b0035..a7346c5db 100644
--- a/netbox/templates/dcim/device_lldp_neighbors.html
+++ b/netbox/templates/dcim/device_lldp_neighbors.html
@@ -3,64 +3,66 @@
 {% block title %}{{ device }} - LLDP Neighbors{% endblock %}
 
 {% block content %}
-{% include 'dcim/inc/device_header.html' with active_tab='lldp-neighbors' %}
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <strong>LLDP Neighbors</strong>
-    </div>
-    <table class="table table-hover panel-body">
-        <thead>
-            <tr>
-                <th>Interface</th>
-                <th>Configured Device</th>
-                <th>Configured Interface</th>
-                <th>LLDP Device</th>
-                <th>LLDP Interface</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for iface in interfaces %}
-                <tr id="{{ iface }}">
-                    <td>{{ iface }}</td>
-                    {% if iface.connection %}
-                        {% with iface.connected_interface as connected_iface %}
-                            <td class="configured_device" data="{{ connected_iface.device }}">
-                                <a href="{% url 'dcim:device' pk=connected_iface.device.pk %}">{{ connected_iface.device }}</a>
-                            </td>
-                            <td class="configured_interface" data="{{ connected_iface }}">
-                                <span title="{{ connected_iface.get_form_factor_display }}">{{ connected_iface }}</span>
-                            </td>
-                        {% endwith %}
-                    {% else %}
-                        <td colspan="2">None</td>
-                    {% endif %}
-                    <td class="device"></td>
-                    <td class="interface"></td>
+    {% include 'inc/ajax_loader.html' %}
+    {% include 'dcim/inc/device_header.html' with active_tab='lldp-neighbors' %}
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <strong>LLDP Neighbors</strong>
+        </div>
+        <table class="table table-hover panel-body">
+            <thead>
+                <tr>
+                    <th>Interface</th>
+                    <th>Configured Device</th>
+                    <th>Configured Interface</th>
+                    <th>LLDP Device</th>
+                    <th>LLDP Interface</th>
                 </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div>
+            </thead>
+            <tbody>
+                {% for iface in interfaces %}
+                    <tr id="{{ iface.name }}">
+                        <td>{{ iface }}</td>
+                        {% if iface.connection %}
+                            {% with iface.connected_interface as connected_iface %}
+                                <td class="configured_device" data="{{ connected_iface.device }}">
+                                    <a href="{% url 'dcim:device' pk=connected_iface.device.pk %}">{{ connected_iface.device }}</a>
+                                </td>
+                                <td class="configured_interface" data="{{ connected_iface }}">
+                                    <span title="{{ connected_iface.get_form_factor_display }}">{{ connected_iface }}</span>
+                                </td>
+                            {% endwith %}
+                        {% else %}
+                            <td colspan="2">None</td>
+                        {% endif %}
+                        <td class="device"></td>
+                        <td class="interface"></td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
 {% endblock %}
 
 {% block javascript %}
 <script type="text/javascript">
 $(document).ready(function() {
     $.ajax({
-        url: "{% url 'dcim-api:device-lldp-neighbors' pk=device.pk %}",
+        url: "{% url 'dcim-api:device-napalm' pk=device.pk %}?method=get_lldp_neighbors",
         dataType: 'json',
         success: function(json) {
-            $.each(json, function(i, neighbor) {
-                var row = $('#' + neighbor['local-interface'].replace(/(\/)/g, "\\$1"));
+            $.each(json['get_lldp_neighbors'], function(iface, neighbors) {
+                var neighbor = neighbors[0];
+                var row = $('#' + iface.replace(/(\/)/g, "\\$1"));
                 var configured_device = row.children('td.configured_device').attr('data');
                 var configured_interface = row.children('td.configured_interface').attr('data');
                 // Add LLDP neighbors to table
-                row.children('td.device').html(neighbor['name']);
-                row.children('td.interface').html(neighbor['remote-interface']);
+                row.children('td.device').html(neighbor['hostname']);
+                row.children('td.interface').html(neighbor['port']);
                 // Apply colors to rows
-                if (!configured_device && neighbor['name']) {
+                if (!configured_device && neighbor['hostname']) {
                     row.addClass('info');
-                } else if (configured_device == neighbor['name'] && configured_interface == neighbor['remote-interface']) {
+                } else if (configured_device == neighbor['hostname'] && configured_interface == neighbor['port']) {
                     row.addClass('success');
                 } else {
                     row.addClass('danger');