diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index e15a0710e..fa41f1130 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -571,8 +571,6 @@
                             <button class="btn btn-default btn-xs toggle-ips" selected="selected">
                                 <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs
                             </button>
-{#                        </div>#}
-{#                        <div class="pull-right noprint">#}
                             <button class="btn btn-default btn-xs toggle-vlans" selected="selected">
                                 <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show VLANs
                             </button>
@@ -590,8 +588,6 @@
                                 <th>Name</th>
                                 <th>LAG</th>
                                 <th>Description</th>
-{#                                <th>Tagged VLANs</th>#}
-{#                                <th>Untagged VLAN</th>#}
                                 <th>MTU</th>
                                 <th>Mode</th>
                                 <th>Cable</th>
diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html
index c275dfd65..214e920b0 100644
--- a/netbox/templates/dcim/inc/interface.html
+++ b/netbox/templates/dcim/inc/interface.html
@@ -213,7 +213,7 @@
                                 <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a>
                             </td>
 
-{#                             Primary/status/role#}
+                            {# Primary/status/role#}
                             <td>
                                 {% if device.primary_ip4 == ip or device.primary_ip6 == ip %}
                                     <span class="label label-success">Primary</span>
@@ -224,7 +224,7 @@
                                 {% endif %}
                             </td>
 
-{#                             VRF#}
+                            {#VRF#}
                             <td>
                                 {% if ip.vrf %}
                                     <a href="{% url 'ipam:vrf' pk=ip.vrf.pk %}" title="{{ ip.vrf.rd }}">{{ ip.vrf.name }}</a>
@@ -233,7 +233,7 @@
                                 {% endif %}
                             </td>
 
-{#                             Description#}
+                            {#Description#}
                             <td>
                                 {% if ip.description %}
                                     {{ ip.description }}
@@ -242,7 +242,7 @@
                                 {% endif %}
                             </td>
 
-{#                             Buttons#}
+                            {#Buttons#}
                             <td class="text-right text-nowrap noprint">
                                 {% if perms.ipam.change_ipaddress %}
                                     <a href="{% url 'ipam:ipaddress_edit' pk=ip.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs">
@@ -266,12 +266,12 @@
 
 {% if iface.untagged_vlan or iface.tagged_vlans.all %}
     <tr>
-        {#                     Placeholder#}
+        {#Placeholder#}
         {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
             <td class="vlans"></td>
         {% endif %}
 
-        {#         VLAN table #}
+        {#VLAN table#}
         <td class="vlans" colspan="9" style="padding: 0">
             <table class="table table-condensed interface-ips">
                 <thead>
@@ -284,54 +284,54 @@
                 </tr>
                 </thead>
                 <tr>
-                    {# Untagged VLAN #}
+                    {#Untagged VLAN#}
                     {% if iface.untagged_vlan %}
 
-                        {# VLAN ID #}
+                        {#VLAN ID#}
                         <td>
                             <a href="{% url 'ipam:vlan' iface.untagged_vlan.id %}">{{ iface.untagged_vlan.vid }}</a>
                         </td>
-                        {# VLAN tag #}
+                        {#VLAN tag#}
                         <td>
                                 <span class="text-danger">
                                     <li class="fa fa-close"></li>
                                 </span>
                         </td>
-                        {# VLAN status #}
+                        {#VLAN status#}
                         <td>
                             <span class="label label-primary"
                                   style="text-transform: capitalize">{{ iface.untagged_vlan.status }}</span>
                         </td>
-                        {# VLAN name #}
+                        {#VLAN name#}
                         <td>{{ iface.untagged_vlan.name }}</td>
-                        {# VLAN description #}
+                        {#VLAN description#}
                         <td>{{ iface.untagged_vlan.description }}</td>
                     {% endif %}
                 </tr>
 
-                {# Tagged VLANs #}
+                {#Tagged VLANs#}
 
                 {% if iface.tagged_vlans.all %}
                     {% for tag in iface.tagged_vlans.all %}
                         <tr>
-                            {# VLAN ID #}
+                            {#VLAN ID#}
                             <td>
                                 <a href="{% url 'ipam:vlan' tag.id %}">{{ tag.vid }}</a>
                             </td>
-                            {# VLAN tag #}
+                            {#VLAN tag#}
                             <td>
                                     <span class="text-success">
                                         <li class="fa fa-check"></li>
                                     </span>
                             </td>
-                            {# VLAN status #}
+                            {#VLAN status#}
                             <td>
                                         <span class="label label-primary"
                                               style="text-transform: capitalize">{{ tag.status }}</span>
                             </td>
-                            {# VLAN name #}
+                            {#VLAN name#}
                             <td>{{ tag.name }}</td>
-                            {# VLAN description #}
+                            {#VLAN description#}
                             <td>{{ tag.description }}</td>
                         </tr>
                     {% endfor %}