diff --git a/res/app/device-list/device-list.css b/res/app/device-list/device-list.css
index 6156e616..198a06fe 100644
--- a/res/app/device-list/device-list.css
+++ b/res/app/device-list/device-list.css
@@ -172,6 +172,16 @@ ul.devices-icon-view .device-is-busy .device-photo-small img {
 
 .device-list-details-content .stf-device-details-customize {
   white-space: nowrap;
-  padding-left: 10px;
-  padding-right: 10px;
+  padding: 10px;
+  padding-bottom: 0;
+  column-count: 2;
+  -moz-column-count: 2;
+  -webkit-column-count: 2;
+  max-width: 800px;
 }
+
+.device-list-details-content .stf-device-details-customize .radio, .checkbox {
+  margin: 0;
+  margin-bottom: 10px;
+}
+
diff --git a/res/app/device-list/device-list.jade b/res/app/device-list/device-list.jade
index 5372ddcd..30b7162e 100644
--- a/res/app/device-list/device-list.jade
+++ b/res/app/device-list/device-list.jade
@@ -13,16 +13,10 @@ div.stf-device-list
                 i.fa.fa-th-large
                 span(translate) Devices
               div.device-list-devices-content(ng-if='activeTabs.icons')
-                .filtering-buttons.pull-right
+                .filtering-buttons
                   input(type='search',results='5', autosave='deviceSearch'
-                  name='deviceSearch', ng-model='deviceSearch', ng-change='deviceSearchChanged()',
-                  autocorrect='off', autocapitalize='off', spellcheck='false').xform-control.device-search
-
-                  //.input-group
-                    input(type='text').form-control
-                    //span.input-group-btn
-                      button.btn.btn-primary-outline(type='button') Search
-                  //clear-button(ng-click="tableParams.sorting({}); tableParams.filter({})")
+                    name='deviceSearch', ng-model='deviceSearch', ng-change='deviceSearchChanged()',
+                    autocorrect='off', autocapitalize='off', spellcheck='false').form-control.input-sm.device-search.pull-right
                 .clear-filtering-buttons
 
                 device-list-icons(tracker='tracker', sort='sort')
@@ -33,16 +27,11 @@ div.stf-device-list
                 span(translate) Details
               div.device-list-details-content(ng-if='activeTabs.details')
                 .filtering-buttons
-                  div(ng-show='ngTableEnabled')
-                    clear-button(ng-click="clearSorting()")
-                    filter-button(ng-model='filterEnabled')
-                    .button-spacer.pull-right
+                  input(type='search',results='5', autosave='deviceSearch'
+                    name='deviceSearch', ng-model='deviceSearch', ng-change='deviceSearchChanged()',
+                    autocorrect='off', autocapitalize='off', spellcheck='false').form-control.input-sm.device-search.pull-right
 
-                    button(btn-checkbox, ng-model='showAll').btn.btn-sm.btn-primary-outline.pull-right
-                      i.fa.fa-list-alt
-                      span {{"Show All"|translate}}
-
-                  span
+                  span.pull-right
                     .btn-group(dropdown).pull-right
                       button.btn.btn-sm.btn-primary-outline.dropdown-toggle
                         i.fa.fa-table
@@ -54,4 +43,6 @@ div.stf-device-list
                             input(type='checkbox', ng-model='column.selected')
                             span(ng-bind='column.title | translate')
 
+
+
                 device-list-details(tracker='tracker', columns='columns', sort='sort')