diff --git a/libraries/networking/src/NodePermissions.cpp b/libraries/networking/src/NodePermissions.cpp
index cc5df515aa..e94c43b6fb 100644
--- a/libraries/networking/src/NodePermissions.cpp
+++ b/libraries/networking/src/NodePermissions.cpp
@@ -53,8 +53,12 @@ QVariant NodePermissions::toVariant(QHash<QUuid, GroupRank> groupRanks) {
     values["permissions_id"] = _id;
     if (_groupIDSet) {
         values["group_id"] = _groupID;
-        if (groupRanks.contains(_rankID)) {
+
+        if (!_rankID.isNull()) {
             values["rank_id"] = _rankID;
+        }
+
+        if (groupRanks.contains(_rankID)) {
             values["rank_name"] = groupRanks[_rankID].name;
             values["rank_order"] = groupRanks[_rankID].order;
         }
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index b95f774d0f..42a938e78d 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -133,19 +133,20 @@
                             </div>
                         </div>
                     </fieldset>
-                    <fieldset style="display:none;">
-                        <div class="column" id="group-cloneable-group" style="display:none;">
-                            <div class="sub-section-header">
-                                <span>Cloneable Settings</span>
-                            </div>
-                            <div class="cloneable-group property gen">
-                                <div><label>Clone Lifetime</label><input type="number" data-user-data-type="cloneLifetime" id="property-cloneable-lifetime"></div>
-                                <div><label>Clone Limit</label><input type="number" data-user-data-type="cloneLimit" id="property-cloneable-limit"></div>
-                                <div class="property checkbox">
-                                    <input type="checkbox" id="property-cloneable-dynamic">
-                                    <label for="property-cloneable-dynamic">Clone Dynamic</label>
-                                </div>
-                            </div>
+
+                    <fieldset class="column" id="group-cloneable-group" style="display:none;">
+                        <legend class="sub-section-header">
+                             <span>Cloneable Settings</span>
+                        </legend>
+                        <fieldset class="minor">
+                             <div><label>Clone Lifetime</label><input type="number" data-user-data-type="cloneLifetime" id="property-cloneable-lifetime"></div>
+                        </fieldset>
+                        <fieldset class="minor">
+                             <div><label>Clone Limit   </label><input type="number" data-user-data-type="cloneLimit" id="property-cloneable-limit"></div>
+                        </fieldset>
+                        <div class="property checkbox">
+                             <input type="checkbox" id="property-cloneable-dynamic">
+                             <label for="property-cloneable-dynamic">Clone Dynamic</label>
                         </div>
                     </fieldset>
                 </div>
@@ -445,6 +446,10 @@
                             <input type="checkbox" id="property-model-animation-hold">
                             <label for="property-model-animation-hold">Animation hold</label>
                         </div>
+                        <div class="property checkbox indent">
+                            <input type="checkbox" id="property-model-animation-allow-translation">
+                            <label for="property-model-animation-allow-translation">Animation Allow Translation</label>
+                        </div>
                         <div id="animation-fps" class="property number">
                             <label>Animation FPS</label>
                             <input type="number" id="property-model-animation-fps">
@@ -513,15 +518,6 @@
                         <div><input type="number" class="green" id="property-zone-key-light-color-green" min="0" max="255" step="1"><label for="property-zone-key-light-color-green">Green:</label></div>
                         <div><input type="number" class="blue" id="property-zone-key-light-color-blue" min="0" max="255" step="1"><label for="property-zone-key-light-color-blue">Blue:</label></div>
                     </div>
-<<<<<<< HEAD
-                    <div class="property checkbox indent">
-                        <input type="checkbox" id="property-model-animation-allow-translation">
-                        <label for="property-model-animation-allow-translation">Animation Allow Translation</label>
-                    </div>
-                    <div id="animation-fps" class="property number">
-                        <label>Animation FPS</label>
-                        <input type="number" id="property-model-animation-fps">
-=======
                 </div>
                 <div class="zone-section keylight-section zone-group property number">
                     <label>Light intensity</label>
@@ -532,7 +528,6 @@
                         <div><label>Light altitude <span class="unit">deg</span></label><input type="number" id="property-zone-key-light-direction-x"></div>
                         <div><label>Light azimuth <span class="unit">deg</span></label><input type="number" id="property-zone-key-light-direction-y"></div>
                         <div></div>
->>>>>>> upstream/master
                     </div>
                 </div>
                 <div class="zone-group zone-section keylight-section property number">
@@ -651,10 +646,6 @@
             </div>
         </fieldset>
 
-
-
-
-
         <fieldset id="polyvox" class="major">
             <legend class="section-header spatial-group poly-vox-section property xyz">
                 Voxel volume size <span>m</span>