diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index c1f3bcae3..cd75c2017 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -12,7 +12,7 @@ except ImportError:
                                "the documentation.")
 
 
-VERSION = '1.6.2'
+VERSION = '1.6.2-r1'
 
 # Import local configuration
 for setting in ['ALLOWED_HOSTS', 'DATABASE', 'SECRET_KEY']:
diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/inc/devicetype_component_table.html
index 7b2b14652..6cdb1562b 100644
--- a/netbox/templates/dcim/inc/devicetype_component_table.html
+++ b/netbox/templates/dcim/inc/devicetype_component_table.html
@@ -15,19 +15,20 @@
                 {% endif %}
             </div>
             {% render_table table 'table.html' %}
-            {% if table.rows %}
-                <div class="panel-footer">
+            <div class="panel-footer">
+                {% if table.rows %}
                     <button type="submit" class="btn btn-xs btn-danger">
                         <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> Delete Selected
                     </button>
-                    <div class="pull-right">
-                        <a href="{% url add_url pk=devicetype.pk %}{{ add_url_extra }}" class="btn btn-primary btn-xs">
-                            <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
-                            Add {{ title }}
-                        </a>
-                    </div>
+                {% endif %}
+                <div class="pull-right">
+                    <a href="{% url add_url pk=devicetype.pk %}{{ add_url_extra }}" class="btn btn-primary btn-xs">
+                        <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                        Add {{ title }}
+                    </a>
                 </div>
-            {% endif %}
+                <div class="clearfix"></div>
+            </div>
         </div>
     </form>
 {% else %}