diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 088b0952ae..1b0094cfb7 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -273,7 +273,6 @@ input[type="number"] {
     height: 28px;
     width: 124px;
 }
-
 input[type=number] {
     padding-right: 3px;
 }
@@ -1085,66 +1084,68 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
     bottom: 0;
 }
 
+#filter-type-selectBox select {
+    border-radius: 14.5px;
+}
 #filter-type-checkboxes {
     position: absolute;
     z-index: 2;
-    top: 28px;
+    top: 48px;
     display: none;
     border: none;
 }
 #filter-type-checkboxes div {
     position: relative;
-    height: 25px;
+    height: 22px;
 }
 #filter-type-checkboxes span {
     position: relative;
     top: 3px;
     font-family: hifi-glyphs;
-    font-size: 16px;
-    color: #404040;
-    padding-left: 12px;
-    padding-right: 12px;
+    font-size: 13px;
+    color: #000000;
+    padding-left: 6px;
+    padding-right: 4px;
 }
 #filter-type-checkboxes label {
-    position: relative;
-    top: -13px;
-    z-index: 3;
+    position: absolute;
+    top: -20px;
+    z-index: 2;
     display: block;
     font-family: FiraSans-SemiBold;
-    color: #404040;
+    font-size: 11px;
+    color: #000000;
     background-color: #afafaf;
+    width: 200px;
+    height: 22px;
     padding-top: 1px;
-    padding-right: 12px;
-    height: 24px;
 }
 #filter-type-checkboxes label:hover {
     background-color: #1e90ff;
 }
-#filter-type-checkboxes input[type=checkbox] {
-    position: relative;
-    top: 6px;
-    right: -10px;
-    z-index: 4;
-    display: block;
-}
 #filter-type-checkboxes input[type=checkbox] + label {
-    background-image: none;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAYAAAAehFoBAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4goSADUOYnF4LQAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAIMSURBVFjD7ZmxkqowFIZ/7mwJPen1AezV3t6hFvrQhweAHvrQ8wL2xt4HwD7ppd+tvHOvu0gCYdEZTsmAfpNzzpcTcAB84o3iD94sZuCx4+Pxwvl8dl4JcL1ef84lMQPPwBZDSgkp5XsASylBKUUYhhBCvDbw7XYDpRRKKTRNA8YYOOevC5ymKZRS/13jnHdCTwLMOW8tAc45GGNomuY1gKuq6lxFIQQopdMDXy4X5HmudW8URdMCSynBGNOG3Ww20wHf9dVWl4+wbav7a8CMsW9G+Cm22+1T2F8BzvMc1+u18z5CCJIkseNhKSX2+z2qqjLWl84zhBAURQHXde0A31Oa57nWbqSrLwDwPA9FUcD3fTtb82NKu8QOAHVda+srSRJt2E7gtpQKIXA4HH6csmzpyxj4dDo9TalSCpRS1HX9TV86RujSlxGwlBJpmnY+rJRCGIZ/s2BTX9qnZgBwHAee52mJ/l7nx+PRqr6MVtj3fZRlaVRf/5aGDX0Z17DrusiyrHfqhuqrt9aiKEIcx4OBTfU1aOMIggBlWYIQ0utP+uhr8CyxXC5RFIUxdBAE1srKePgxbcbVamWlnAZNa7rNSAhBlmWv8yLlWTPa0Nco83BbM2ZZZsUIowzwj80YxzEWi8VoB4IPGz9yb0YhBHa73agnGGtHJNd1R4ed9FVV33Awf6ebgd8b+Av9A/rq6s3hjgAAAABJRU5ErkJggg==');
+    background-size: 11px 11px;
+    background-position: top 5px left 14px;
 }
 #filter-type-checkboxes input[type=checkbox]:checked + label {
-    background-image: none;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAYAAAAehFoBAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH4goSADMveELP9QAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAAAIqSURBVFjD7ZmxkqowFIb/7GwJPfT6APZib+9QC33o4QGghz70vIC9sfcBsE966bPNWlxnlQTDRWc4JUT4hpPz5SQSAAofFF/4sJiBx47v+wun04m8E+B6vVbzlJiBZ2CLIYRQQgj1EcBCCEUpRRRF4Jyrtwa+Xq+glEJKia7rkKYpGGPqbYHzPFdSyn+uMcZ6oScBZowpzvmje0jTVHVd9x7ATdMoxtjTMZxzUErV5MDn81mVZak1No7jab+wEEKlaaoNGwQBmQz4pq9H8/IeNo5jMmnRpWmKeyP8FZvN5insfwEuy1JdLpfecb7vI8uy3tb2Szelu91ONU1jtP9jjKmmabRgq6qC4zh2VrpbSsuy1FqNdPUFAK7roqoqeJ6ntXH4Mk1pn9gBoG1bbX1lWaYN2wv8KKWcc+z3+z+7LFv6MgY+Ho9PUyqlBKUUbduqe33pGKFPX0bAQgiV53nvj6WUiKIIt2K0qS/tXTMAEELguq6W6H/nOQ6Hg1V9GX1hz/NIXdckCALtB7Vta1VfxnPYcRwURUEeNSGmYaqvwVqL45gkSfIysKm+Xlo4wjAkdV3D9/1BLxmir5d7ieVySaqqMoYOw3CwEV5ufkyLcbVaIUkSq2d1xt2abjH6vo+iKKwfLA5uL58Vow19jdIPPyrGoiisGGGUBv6+GJMkwWKxGO2M+dvGQ36LEZxztd1uRz0Qt7ZFchwHY8NOelQ1NAjm/+lm4M8G/gH2zx33BSr7jAAAAABJRU5ErkJggg==');
+    background-size: 11px 11px;
+    background-position: top 5px left 14px;
 }
 #filter-type-checkboxes input[type=checkbox]:hover + label {
     background-color: #1e90ff;
 }
 
 #filter-search-and-icon {
-    position: absolute;
-    left: 120px;
-    width: calc(100% - 300px);
+    position: relative;
+    left: 118px;
+    width: calc(100% - 126px);
 }
 
 #filter-in-view {
     position: absolute;
+    top: 0px;
     right: 126px;
 }
 
@@ -1152,13 +1153,18 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
     position: relative;
     float: right;
     margin-right: -168px;
-    top: -17px;
+    top: -45px;
 }
 #filter-radius-and-unit label {
     margin-left: 2px;
 }
 #filter-radius-and-unit input {
     width: 120px;
+    border-radius: 14.5px;
+    font-style: italic;
+}
+#filter-radius-and-unit input[type=number]::-webkit-inner-spin-button {
+    display: none;
 }
 
 #entity-table-scroll {
diff --git a/scripts/system/html/entityList.html b/scripts/system/html/entityList.html
index 8371e2cbd7..dc022c9ab9 100644
--- a/scripts/system/html/entityList.html
+++ b/scripts/system/html/entityList.html
@@ -30,20 +30,20 @@
         </div>
         <div id="entity-list">
             <div id="filter-area">
-				<div class="multiselect">
-					<div class="selectBox" id="filter-type-selectBox">
-						<select>
-							<option id="filter-type-text">All Types</option>
-						</select>
-						<div class="overSelect"></div>
-					</div>
-					<div id="filter-type-checkboxes">
-						<!-- type options with checkbox, icon, and label are added at runtime in entityList -->
-					</div>
-				</div>
-				<div id="filter-search-and-icon">
-					<span class="icon-input"><input type="search" class="search" id="filter-search" placeholder="Filter" /><span>Y</span></span>
-				</div>
+                <div class="multiselect">
+                    <div class="selectBox" id="filter-type-selectBox">
+                        <select>
+                            <option id="filter-type-text">All Types</option>
+                        </select>
+                        <div class="overSelect"></div>
+                    </div>
+                    <div id="filter-type-checkboxes">
+                        <!-- type options with checkbox, icon, and label are added at runtime in entityList -->
+                    </div>
+                </div>
+                <div id="filter-search-and-icon">
+                    <span class="icon-input"><input type="search" class="search" id="filter-search" placeholder="Search" /><span>Y</span></span>
+                </div>
                 <input type="button" id="filter-in-view" class="glyph" value="&#xe007;" />
                 <div id="filter-radius-and-unit" class="number">
                     <label for="radius">Search radius <span class="unit">m</span></label>
diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js
index 400cdc7dce..66ad08e27c 100644
--- a/scripts/system/html/js/entityList.js
+++ b/scripts/system/html/js/entityList.js
@@ -23,6 +23,7 @@ const FILTER_IN_VIEW_ATTRIBUTE = "pressed";
 const WINDOW_NONVARIABLE_HEIGHT = 227;
 const NUM_COLUMNS = 12;
 const EMPTY_ENTITY_ID = "0";
+const MAX_LENGTH_RADIUS = 9;
 const DELETE = 46; // Key code for the delete key.
 const KEY_P = 80; // Key code for letter p used for Parenting hotkey.
 
@@ -203,7 +204,11 @@ function loaded() {
         elFilterSearch.onsearch = refreshEntityList;
         elFilterInView.onclick = toggleFilterInView;
         elFilterRadius.onchange = onRadiusChange;
-        elInfoToggle.onclick = toggleInfo;
+        elFilterRadius.oninput = function(event) {
+            if (event.target.value.length > MAX_LENGTH_RADIUS) {
+                event.target.value = event.target.value.slice(0, MAX_LENGTH_RADIUS); 
+            }
+        }
         
         // create filter type dropdown checkboxes with label and icon for each type
         elFilterTypeSelectBox.onclick = toggleTypeDropdown;