diff --git a/app/common/components/account/shared-with-me/shared-with-me.directive.html b/app/common/components/account/shared-with-me/shared-with-me.directive.html
index 6b7aea76..f7dfbba9 100644
--- a/app/common/components/account/shared-with-me/shared-with-me.directive.html
+++ b/app/common/components/account/shared-with-me/shared-with-me.directive.html
@@ -1,6 +1,6 @@
 <li uib-dropdown data-e2e="shared-with-me">
   <a uib-dropdown-toggle>
-    <i class="fa fa-users fa-fw fa-lg"></i>Shared to me<span class="caret"></span>
+    <i class="fa fa-users fa-fw fa-lg"></i>Shared with me<span class="caret"></span>
   </a>
   <ul class="dropdown-menu dropdown-menu-right">
     <li class="disabled" ng-show="session.account.shared.length == 0">
diff --git a/app/common/components/device/certificate/certificate-button/certificate-button.directive.js b/app/common/components/device/certificate/certificate-button/certificate-button.directive.js
index 62e15257..12f98214 100644
--- a/app/common/components/device/certificate/certificate-button/certificate-button.directive.js
+++ b/app/common/components/device/certificate/certificate-button/certificate-button.directive.js
@@ -1,15 +1,18 @@
-function certificateButton (dhModal) {
+function certificateButton (dhModal, ResourceListSelector) {
   return {
     template: require('./certificate-button.directive.html'),
     restrict: 'E',
-    scope: {
-      resources: '='
-    },
+    scope: {},
     link: $scope => {
       $scope.dropDownIsOpen = false
-      $scope.$watchCollection('resources', resources => {
-        $scope.allComputers = _.every(resources, {'@type': 'Computer'})
-      })
+
+      function setView () {
+        $scope.resources = ResourceListSelector.getAllSelectedDevices()
+        $scope.allComputers = _.every($scope.resources, {'@type': 'Computer'})
+      }
+      setView()
+      ResourceListSelector.callbackOnSelection(setView)
+
       $scope.certificates = [
         {
           title: 'Erasure',
@@ -17,11 +20,11 @@ function certificateButton (dhModal) {
           description: 'Shows a brief and the details of the hard-drives erased.'
         }
       ]
-      /*{
+      /* {
        title: 'Receipt',
        icon: ResourceSettings('resources:Receive').settings.fa,
        description: 'Generates a legal receipt for a receiver to sign.'
-       }*/
+       } */
       $scope.openDropdown = function ($event) {
         if ($scope.allComputers && $scope.resources.length > 0) $scope.dropDownIsOpen = true
         $event.stopPropagation()  // https://github.com/angular-ui/bootstrap/issues/6038
diff --git a/app/common/components/elements/header-nav/header-nav.directive.sass b/app/common/components/elements/header-nav/header-nav.directive.sass
index 69590129..8c61246f 100644
--- a/app/common/components/elements/header-nav/header-nav.directive.sass
+++ b/app/common/components/elements/header-nav/header-nav.directive.sass
@@ -7,7 +7,7 @@ header-nav
     user-select: none
     .navbar-brand
       float: left
-      padding: 2px $navbar-padding-horizontal
+      padding: $navbar-padding-vertical $navbar-padding-horizontal
       font-size: $font-size-h2
       line-height: $headings-line-height
       height: $navbar-height
@@ -22,6 +22,6 @@ header-nav
   .navbar-toggle
     padding: 5px 10px
 
-  @media (min-width: $grid-float-breakpoint)
-    .navbar > .container, .navbar > .container-fluid
-      margin-left: -$navbar-padding-horizontal
+  //@media (min-width: $grid-float-breakpoint)
+  //  .navbar > .container, .navbar > .container-fluid
+  //    margin-left: -$navbar-padding-horizontal
diff --git a/app/common/components/elements/new-button/new-button.directive.html b/app/common/components/elements/new-button/new-button.directive.html
index d3b0523e..7ebe2c2c 100644
--- a/app/common/components/elements/new-button/new-button.directive.html
+++ b/app/common/components/elements/new-button/new-button.directive.html
@@ -36,29 +36,9 @@
       Placeholders
     </a></li>
     <li role="menuitem" class="dropdown-header">New group</li>
-    <li role="menuitem"><a ng-click="open.group('Place')">
-      <resource-icon resource-type="Place"></resource-icon>
-      Place
-    </a></li>
     <li role="menuitem"><a ng-click="open.group('Lot')">
       <resource-icon resource-type="Lot"></resource-icon>
-      lot
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('IncomingLot')">
-      <resource-icon resource-type="Lot"></resource-icon>
-      Incoming lot
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('OutgoingLot')">
-      <resource-icon resource-type="Lot"></resource-icon>
-      Outgoing lot
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('Package')">
-      <resource-icon resource-type="Package"></resource-icon>
-      Package
-    </a></li>
-    <li role="menuitem"><a ng-click="open.group('Pallet')">
-      <resource-icon resource-type="Pallet"></resource-icon>
-      Pallet
+      Lot
     </a></li>
   </ul>
 </li>
diff --git a/app/common/components/event/manual-events-button/manual-events-button.directive.html b/app/common/components/event/manual-events-button/manual-events-button.directive.html
index 6e0cd555..75c6110e 100644
--- a/app/common/components/event/manual-events-button/manual-events-button.directive.html
+++ b/app/common/components/event/manual-events-button/manual-events-button.directive.html
@@ -2,7 +2,7 @@
   <button id="event-button"
           type="button"
           class="btn"
-          ng-class="{'btn-primary': resources.length > 0}"
+          ng-class="{'btn-primary': selector.getAllSelectedDevices().length > 0}"
           uib-dropdown-toggle
   >
     <i class="fa fa-plus fa-fw"></i>New event<span class="caret"></span>
@@ -14,7 +14,7 @@
         tooltip-placement="right"
         tooltip-append-to-body="true"
     >
-      <a ng-click="openModal(eventSettings.type, resources)">
+      <a ng-click="openModal(eventSettings.type)">
         <resource-icon resource-type="{{::eventSettings.type}}" fill-to="true"></resource-icon>
         {{::eventSettings.humanName}}
       </a>
diff --git a/app/common/components/event/manual-events-button/manual-events-button.directive.js b/app/common/components/event/manual-events-button/manual-events-button.directive.js
index ac8a7449..7fc2765c 100644
--- a/app/common/components/event/manual-events-button/manual-events-button.directive.js
+++ b/app/common/components/event/manual-events-button/manual-events-button.directive.js
@@ -1,15 +1,17 @@
-function manualEventsButton (ResourceSettings, dhModal) {
+function manualEventsButton (ResourceSettings, dhModal, ResourceListSelector) {
   return {
     template: require('./manual-events-button.directive.html'),
     restrict: 'E',
-    scope: {
-      resources: '='
-    },
+    scope: {},
     link: $scope => {
+      $scope.selector = ResourceListSelector
       $scope.events = ResourceSettings('devices:DeviceEvent').getSubResources()
       // If the passed-in resources are groups, we won't use the 'devices' field of the event, and otherwise
 
-      $scope.openModal = require('./../open-event-modal')(ResourceSettings, dhModal)
+      $scope.openModal = (eventType) => {
+        let resources = ResourceListSelector.getAllSelectedDevices()
+        require('./../open-event-modal')(ResourceSettings, dhModal)(eventType, resources)
+      }
     }
   }
 }
diff --git a/app/common/components/group/group-resource-action/group-resource-remove.directive.spec.js b/app/common/components/group/group-resource-action/group-resource-remove.directive.spec.js
index e6efa3d4..a9da9a67 100644
--- a/app/common/components/group/group-resource-action/group-resource-remove.directive.spec.js
+++ b/app/common/components/group/group-resource-action/group-resource-remove.directive.spec.js
@@ -23,7 +23,7 @@ describe('Test resourceRemove', () => {
                            success="_success()"
     ></group-resource-remove>`)
 
-  it('enables to remove only groups with presence in at least one device', () => {
+  it('displays only groups of given resources', () => {
     const params = {
       resources: [
         {
diff --git a/app/common/components/group/group-resource-button/group-resource-button.directive.html b/app/common/components/group/group-resource-button/group-resource-button.directive.html
index d501645c..ba8652c4 100644
--- a/app/common/components/group/group-resource-button/group-resource-button.directive.html
+++ b/app/common/components/group/group-resource-button/group-resource-button.directive.html
@@ -1,7 +1,6 @@
 <div class="btn-group" uib-dropdown is-open="status.isopen">
   <button type="button"
-          class="btn"
-          ng-class="{'btn-primary': resources.length > 0}"
+          class="btn btn-primary"
           uib-dropdown-toggle
 
           uib-popover-template="popover.templateUrl"
@@ -14,7 +13,7 @@
           ng-click="closePopover()"
   >
     <span class="">
-      <i class="fa fa-folder fa-fw"></i>Organize <span class="caret"></span>
+      <i class="fa fa-folder fa-fw"></i>Edit lots<span class="caret"></span>
     </span>
   </button>
   <ul uib-dropdown-menu role="menu" class="dropdown-menu-right">
diff --git a/app/common/components/group/group-resource-button/group-resource-button.directive.js b/app/common/components/group/group-resource-button/group-resource-button.directive.js
index aae34081..54a34601 100644
--- a/app/common/components/group/group-resource-button/group-resource-button.directive.js
+++ b/app/common/components/group/group-resource-button/group-resource-button.directive.js
@@ -3,20 +3,30 @@ function groupResourceButton () {
    * @ngdoc directive
    * @name groupResourceButton
    * @description Button with drop-down to add, move and remove resources within groups.
-   * @param {'resource'[]} resources - The resources.
    * @param {string} resourceType - The type of the resources.
    * @param {expression} success - Callback executed when an action has been executed successfully.
    */
   return {
-    templateUrl: require('./__init__').PATH + '/group-resource-button.directive.html',
+    template: require('./group-resource-button.directive.html'),
     restrict: 'E',
     scope: {
-      resources: '=',
       resourceType: '@',
-      success: '&'
+      success: '&',
+      getResources: '&',
+      registerToResourcesUpdate: '&',
+      resource: '='
     },
     link: $scope => {
-      let menu = [
+      function setView () {
+        $scope.resources = $scope.getResources()
+      }
+      if ($scope.resource) {
+        $scope.resources = [ $scope.resource ]
+      } else {
+        setView()
+        $scope.registerToResourcesUpdate({ callback: setView })
+      }
+      $scope.menu = [
         // {title: 'Lot', group: 'Lot', resourceTypes: ['Package', 'Device', 'Lot', 'Pallet']},
         {
           label: 'Add to lot',
@@ -37,59 +47,7 @@ function groupResourceButton () {
           tooltip: `Removes the items from a lot.`,
           fa: 'fa-minus'
         }
-        // {title: 'Package', group: 'Package', resourceTypes: ['Device', 'Package']},
-        // {
-        //   label: 'Move to package',
-        //   action: 'move',
-        //   group: 'Package',
-        //   resourceTypes: ['Device'],
-        //   tooltip: 'Replaces the package of the items.',
-        //   fa: 'fa-long-arrow-right'
-        // },
-        // {
-        //   label: 'Remove from packages',
-        //   action: 'remove',
-        //   group: 'Package',
-        //   resourceTypes: ['Device'],
-        //   tooltip: 'Removes the items from their packages.',
-        //   fa: 'fa-minus'
-        // },
-        // {title: 'Place', group: 'Place', resourceTypes: ['Package', 'Device', 'Lot', 'Place', 'Pallet']},
-        // {
-        //   label: 'Move to place',
-        //   action: 'move',
-        //   group: 'Place',
-        //   resourceTypes: ['Package', 'Device', 'Lot', 'Place', 'Pallet'],
-        //   tooltip: 'Replaces the place of the items.',
-        //   fa: 'fa-long-arrow-right'
-        // },
-        // {
-        //   label: 'Remove from places',
-        //   action: 'remove',
-        //   group: 'Place',
-        //   resourceTypes: ['Package', 'Device', 'Lot', 'Place', 'Pallet'],
-        //   tooltip: 'Removes the items from their places.',
-        //   fa: 'fa-minus'
-        // },
-        // {title: 'Pallet', group: 'Pallet', resourceTypes: ['Device', 'Package']},
-        // {
-        //   label: 'Move to pallet',
-        //   action: 'move',
-        //   group: 'Pallet',
-        //   resourceTypes: ['Device', 'Package'],
-        //   tooltip: 'Replaces the pallet of the items.',
-        //   fa: 'fa-long-arrow-right'
-        // },
-        // {
-        //   label: 'Remove from pallets',
-        //   action: 'remove',
-        //   group: 'Pallet',
-        //   resourceTypes: ['Device', 'Package'],
-        //   tooltip: 'Removes the items from their pallet.',
-        //   fa: 'fa-minus'
-        // }
       ]
-      $scope.menu = _(menu).remove(menuItem => _.includes(menuItem.resourceTypes, $scope.resourceType)).value()
 
       $scope.popover = {
         templateUrl: require('./__init__').PATH + '/group-resource-button.popover.template.html',
diff --git a/app/common/components/place/create-place/create-place.directive.html b/app/common/components/place/create-place/create-place.directive.html
deleted file mode 100644
index 306d3644..00000000
--- a/app/common/components/place/create-place/create-place.directive.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<small ng-click="openModal()">
-    <i class="fa fa-plus"></i>
-</small>
diff --git a/app/common/components/place/create-place/create-place.directive.js b/app/common/components/place/create-place/create-place.directive.js
deleted file mode 100644
index d9efc9a6..00000000
--- a/app/common/components/place/create-place/create-place.directive.js
+++ /dev/null
@@ -1,28 +0,0 @@
-function createPlace ($uibModal) {
-  return {
-    templateUrl: window.COMPONENTS + '/place/create-place/create-place.directive.html',
-    restrict: 'E',
-    link: function ($scope) {
-      $scope.openModal = openModalFactory($uibModal)
-    }
-  }
-}
-
-function openModalFactory ($uibModal) {
-  return function () {
-    $uibModal.open({
-      templateUrl: window.COMPONENTS + '/forms/form-modal/form-modal.controller.html',
-      controller: 'formModalCtrl',
-      resolve: {
-        model: function () {
-          return {'@type': 'Place'}
-        },
-        options: function () {
-          return {doNotUse: ['devices']}
-        }
-      }
-    })
-  }
-}
-
-module.exports = createPlace
diff --git a/app/common/components/place/edit-place/edit-place.directive.html b/app/common/components/place/edit-place/edit-place.directive.html
deleted file mode 100644
index 93572cfc..00000000
--- a/app/common/components/place/edit-place/edit-place.directive.html
+++ /dev/null
@@ -1 +0,0 @@
-<i ng-click="openModal()" class="fa fa-edit"></i>
diff --git a/app/common/components/place/edit-place/edit-place.directive.js b/app/common/components/place/edit-place/edit-place.directive.js
deleted file mode 100644
index 6d92959d..00000000
--- a/app/common/components/place/edit-place/edit-place.directive.js
+++ /dev/null
@@ -1,41 +0,0 @@
-var utils = require('./../../utils.js')
-
-function createPlace ($uibModal, $rootScope) {
-  return {
-    templateUrl: window.COMPONENTS + '/place/edit-place/edit-place.directive.html',
-    restrict: 'E',
-    scope: {
-      place: '='
-    },
-    link: function ($scope) {
-      $scope.openModal = openModalFactory($uibModal, $scope.place, $rootScope)
-    }
-  }
-}
-
-function openModalFactory ($uibModal, place, $rootScope) {
-  return function () {
-    var p = utils.copy(place)
-    p.devices = _.map(p.devices, function (elem) {
-      return {'_id': elem}
-    })
-    var modal = $uibModal.open({
-      templateUrl: window.COMPONENTS + '/forms/form-modal/form-modal.controller.html',
-      controller: 'formModalCtrl',
-      resolve: {
-        model: function () {
-          return p
-        },
-        options: function () {
-          return {doNotUse: []}
-        }
-      }
-    })
-    modal.result.then(function (reason) {
-      // We need to refresh the devicelist to update them, if their place has changed
-      if (reason === 'success' && !_.isEqual(p.devices, place.devices)) $rootScope.$broadcast('refresh@deviceList')
-    })
-  }
-}
-
-module.exports = createPlace
diff --git a/app/common/components/place/index.js b/app/common/components/place/index.js
deleted file mode 100644
index e09f8e41..00000000
--- a/app/common/components/place/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-require('angular-ui-bootstrap')
-require('angular-animate')
-require('angular-simple-logger') // Required by angular-google-maps
-require('angular-google-maps')
-require('bower_components/ngGeolocation/ngGeolocation.js')
-require('angular-ui-notification')
-require('angular-recursion')
-
-module.exports = angular.module('common.components.placeNav',
-  [
-    'ui.bootstrap',
-    'ngAnimate',
-    'uiGmapgoogle-maps',
-    'ngGeolocation',
-    require('./../forms').name,
-    require('./../resource').name,
-    'ui-notification',
-    'RecursionHelper'
-  ]
-)
-.directive('placeIcon', require('./place-icon.directive.js'))
-.directive('createPlace', require('./create-place/create-place.directive.js'))
-.directive('editPlace', require('./edit-place/edit-place.directive.js'))
-.directive('placeNav', require('./place-nav.directive.js'))
diff --git a/app/common/components/place/place-icon.directive.js b/app/common/components/place/place-icon.directive.js
deleted file mode 100644
index 2e76363f..00000000
--- a/app/common/components/place/place-icon.directive.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function placeIcon () {
-  return {
-    template: '<i class="fa fa-home"></i>',
-    restrict: 'E'
-  }
-}
-
-module.exports = placeIcon
diff --git a/app/common/components/place/place-nav.directive.html b/app/common/components/place/place-nav.directive.html
deleted file mode 100644
index a1ba4d24..00000000
--- a/app/common/components/place/place-nav.directive.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div>
-  <h3 class="row">
-    <span class="col-xs-9">Places</span>
-    <create-place class="col-xs-3"></create-place>
-  </h3>
-  <div class="fill-height">
-    <a class="list-group-item"
-       ng-repeat="place in places"
-       ng-click="broadcastSelectedPlace(place._id)"
-       ng-class="{active: isSelected(place._id)}"
-    >
-      <i ng-if="devices.length > 0"
-         ng-click="$event.stopPropagation(); moveDevices(place, devices)"
-         class="fa fa-sign-in pull-right ani-show"
-      ></i>
-      <edit-place place="place"></edit-place>
-      {{place.label}}
-    </a>
-  </div>
-</div>
diff --git a/app/common/components/place/place-nav.directive.js b/app/common/components/place/place-nav.directive.js
deleted file mode 100644
index e4ef60f3..00000000
--- a/app/common/components/place/place-nav.directive.js
+++ /dev/null
@@ -1,64 +0,0 @@
-function placeNavDirective (ResourceSettings, $rootScope, Notification) {
-  return {
-    templateUrl: window.COMPONENTS + '/place/place-nav.directive.html',
-    restrict: 'E',
-    scope: {},
-    link: function ($scope) {
-      var getPlaces = function () {
-        ResourceSettings('Place').server.getList().then(function (data) { // Let's get the places
-          $scope.places = data
-          $scope.selected_id = null
-          $rootScope.$broadcast('get@placeNav', data)
-        })
-      }
-      getPlaces()
-      $scope.broadcastSelectedPlace = function (placeId) {
-        if ($scope.isSelected(placeId)) {
-          $rootScope.$broadcast('unselectedPlace@placeNavWidget')
-          $scope.selected_id = null
-        } else {
-          $rootScope.$broadcast('selectedPlace@placeNavWidget', placeId)
-          $scope.selected_id = placeId
-        }
-      }
-      $scope.$on('submitted@Place', getPlaces)
-      $scope.$on('refresh@deviceHub', getPlaces)
-      $scope.$on('selectedDevices@deviceList', function (event, devices) {
-        $scope.devices = devices
-      })
-
-      $scope.moveDevices = function (place, newDevices) {
-        if (_.find(newDevices, function (device) {
-          return ResourceSettings(device['@type'])
-            .isSubResource('Component')
-        })) {
-          Notification.error('You cannot move components; deselect them.')
-          return
-        }
-        var ids = _.union(_.clone(place.devices) || [], _.map(newDevices, '_id'))
-        if (_.isEqual(place.devices, ids)) {
-          Notification.warning('All the devices are already in the place, so we are not moving them.')
-          return
-        }
-        var dataToSend = {
-          '@type': 'Place',
-          'devices': ids,
-          '_id': place._id
-        }
-        place.patch(dataToSend).then(function () {
-          $rootScope.$broadcast('refresh@deviceList')
-          place.devices = ids // We update the local copy of place with the new devices
-          Notification.success('Devices moved to place ' + place.label + '.')
-        }, function (data) {
-          console.log(data)
-          Notification.error('We could not move the computers.')
-        })
-      }
-      $scope.isSelected = function (placeId) {
-        return placeId === $scope.selected_id
-      }
-    }
-  }
-}
-
-module.exports = placeNavDirective
diff --git a/app/common/components/place/place-nav.directive.sass b/app/common/components/place/place-nav.directive.sass
deleted file mode 100644
index 312ca17c..00000000
--- a/app/common/components/place/place-nav.directive.sass
+++ /dev/null
@@ -1,20 +0,0 @@
-@import '../../styles/variables'
-$titleHeight: 28px + 21px + 10.5px // height + h3's height margins
-
-place-nav
-  .list-group-item
-    edit-place
-      display: none
-    &:hover edit-place
-      display: inline-block
-  .fill-height
-    height: calc(100vh - #{$navbar-height} - #{$footerHeight} - #{$titleHeight})
-    overflow-y: auto
-
-
-.angular-google-map-container
-  height: 500px
-
-@media screen and (max-height: 700px)
-  .angular-google-map-container
-    height: 300px
diff --git a/app/common/components/resource/index.js b/app/common/components/resource/index.js
index 0b3f7747..1294aecf 100644
--- a/app/common/components/resource/index.js
+++ b/app/common/components/resource/index.js
@@ -38,7 +38,6 @@ module.exports = angular.module('common.components.resource',
   .directive('resourceIcon', require('./resource-icon/resource-icon.directive'))
   .directive('resourceView', require('./resource-view/resource-view.directive'))
   .factory('ResourceViewGenerator', require('./resource-view/resource-view-generator.factory'))
-  .factory('Subview', require('./resource-view/subview.factory'))
   .directive('resourceButton', require('./resource-button/resource-button.directive'))
   .directive('deleteButton', require('./delete-button/delete-button.directive'))
   .directive('resource', require('./resource/resource.directive'))
@@ -46,9 +45,7 @@ module.exports = angular.module('common.components.resource',
   // Resource-list
   .directive('resourceList', require('./resource-list/resource-list.directive'))
   .factory('ResourceListGetter', require('./resource-list/resource-list-getter.factory'))
-  .factory('ResourceListGetterBig', require('./resource-list/resource-list-getter-big.factory'))
-  .factory('ResourceListSelector', require('./resource-list/resource-list-selector.factory'))
-  .factory('ResourceListSelectorBig', require('./resource-list/resource-list-selector-big.factory'))
+  .service('ResourceListSelector', require('./resource-list/resource-list-selector.service'))
   .factory('ResourceViewGenerator', require('./resource-view/resource-view-generator.factory'))
   .factory('resourceListConfig', require('./resource-list/resource-list-config.factory'))
   .directive('resourceListFooter', require('./resource-list/resource-list-footer/resource-list-footer.directive'))
diff --git a/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.directive.html b/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.directive.html
index 7372ba93..07118afd 100644
--- a/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.directive.html
+++ b/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.directive.html
@@ -1,8 +1,16 @@
 <ol class="breadcrumb">
   <li ng-repeat="resource in log" ng-class="{active: $last}">
     <strong ng-if="resource._id && $last">
+      <group-resource-button
+              resource-type="Lot"
+              resource="resource"
+      >
+      </group-resource-button>
       <resource-icon resource-type="{{::resource['@type']}}" resourceSubtype="{{::resource.type}}"></resource-icon>
-      {{resource | resourceTitle}}
+
+      <resource-field-edit resource="resource" field="{ key: 'label', value: resource.label, editable: true }">
+        {{resource | resourceTitle}}
+      </resource-field-edit>
     </strong>
     <strong ng-if="!resource._id && $last">
       My inventory
diff --git a/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.service.js b/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.service.js
index f6e31419..074a3a7a 100644
--- a/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.service.js
+++ b/app/common/components/resource/resource-breadcrumb/resource-breadcrumb.service.js
@@ -71,6 +71,12 @@ class ResourceBreadcrumb {
     this.$state.go(this.STATE, {folderPath: path})
   }
 
+  goToRoot () {
+    this.log.length = 0
+    this.log.push({})
+    return this.$state.go('index.inventory', { reload: false })
+  }
+
   /**
    * Converts a path (string) to a log (array).
    * @param {string} path
diff --git a/app/common/components/resource/resource-config.constant.js b/app/common/components/resource/resource-config.constant.js
index 272e2903..1a7c6f6e 100644
--- a/app/common/components/resource/resource-config.constant.js
+++ b/app/common/components/resource/resource-config.constant.js
@@ -8,24 +8,24 @@ const GROUP_DO_NOT_USE = DO_NOT_USE.concat(['children', 'policies', 'perms', 'sh
  * @type {{resources}}
  */
 const v = {
-  InventoryDashboard: {
-    view: 'inventory-dashboard',
-    name: 'Dashboard',
-    'class': 'fill-height show',
-    fa: 'fa-dashboard'
-  },
-  Dashboard: {view: 'resource-dashboard', name: 'Dashboard', 'class': 'fill-height show', fa: 'fa-dashboard'},
-  Detail: {view: 'table-view', name: 'Detail', 'class': 'fill-height show', fa: ['fa-info', 'fa-edit']},
+  // InventoryDashboard: {
+  //   view: 'inventory-dashboard',
+  //   name: 'Dashboard',
+  //   'class': 'fill-height show',
+  //   fa: 'fa-dashboard'
+  // },
+  // Dashboard: {view: 'resource-dashboard', name: 'Dashboard', 'class': 'fill-height show', fa: 'fa-dashboard'},
+  // Detail: {view: 'table-view', name: 'Detail', 'class': 'fill-height show', fa: ['fa-info', 'fa-edit']},
   Device: {view: 'resource-list', resourceType: 'Device', name: 'Devices', fa: 'fa-desktop'},
-  Event: {view: 'resource-list', resourceType: 'Event', name: 'Events', resourceIcon: 'Event'},
-  Place: {view: 'resource-list', resourceType: 'Place', name: 'Places', resourceIcon: 'Place'},
-  Lot: {view: 'resource-list', resourceType: 'Lot', name: 'Lots', resourceIcon: 'Lot'},
-  Pallet: {view: 'resource-list', resourceType: 'Pallet', name: 'Pallets', resourceIcon: 'Pallet'},
-  Package: {view: 'resource-list', resourceType: 'Package', name: 'Packages', resourceIcon: 'Package'},
-  Account: {view: 'resource-list', resourceType: 'Account', name: 'Accounts', resourceIcon: 'Account'},
-  Reserve: {view: 'reserve-view', name: 'Reserve', 'class': 'fill-height show', resourceIcon: 'devices:Reserve'},
-  Sell: {view: 'sell-view', name: 'Sell', 'class': 'fill-height show', resourceIcon: 'devices:Sell'},
-  DeviceDashboard: {view: 'device-dashboard', name: 'Dashboard', 'class': 'fill-height show', fa: 'fa-dashboard'}
+  // Event: {view: 'resource-list', resourceType: 'Event', name: 'Events', resourceIcon: 'Event'},
+  // Place: {view: 'resource-list', resourceType: 'Place', name: 'Places', resourceIcon: 'Place'},
+  Lot: {view: 'resource-list', resourceType: 'Lot', name: 'Lots', resourceIcon: 'Lot', fa: 'fa-folder-o'}
+  // Pallet: {view: 'resource-list', resourceType: 'Pallet', name: 'Pallets', resourceIcon: 'Pallet'},
+  // Package: {view: 'resource-list', resourceType: 'Package', name: 'Packages', resourceIcon: 'Package'},
+  // Account: {view: 'resource-list', resourceType: 'Account', name: 'Accounts', resourceIcon: 'Account'},
+  // Reserve: {view: 'reserve-view', name: 'Reserve', 'class': 'fill-height show', resourceIcon: 'devices:Reserve'},
+  // Sell: {view: 'sell-view', name: 'Sell', 'class': 'fill-height show', resourceIcon: 'devices:Sell'},
+  // DeviceDashboard: {view: 'device-dashboard', name: 'Dashboard', 'class': 'fill-height show', fa: 'fa-dashboard'}
 }
 const RESOURCE_CONFIG = {
   resources: {
@@ -71,8 +71,8 @@ const RESOURCE_CONFIG = {
         subtitle: [{key: 'model'}, {key: 'manufacturer'}]
       },
       // We pass a 'resource' object to a subview with, at least, @type.
-      subviews: [v.DeviceDashboard, v.Event, v.Detail],
-      subviewSmall: v.DeviceDashboard,
+      // subviews: [v.DeviceDashboard, v.Event, v.Detail],
+      // subviewSmall: v.DeviceDashboard,
       doNotUse: DO_NOT_USE.concat(['events', 'owners', 'components', 'isUidSecured', 'public', 'icon', 'pid',
         'labelId', 'placeholder', 'parent', 'place', 'perms']),
       label: {
@@ -87,9 +87,9 @@ const RESOURCE_CONFIG = {
       _root: true
     },
     Event: {
-      view: {title: [{key: '@type', humanize: true}, {key: 'label'}], subtitle: [{key: '_id'}]},
-      subviews: [v.Device, v.Detail],
-      subviewSmall: v.Detail,
+      // view: {title: [{key: '@type', humanize: true}, {key: 'label'}], subtitle: [{key: '_id'}]},
+      // subviews: [v.Device, v.Detail],
+      // subviewSmall: v.Detail,
       doNotUse: ['geo'].concat(DO_NOT_USE),
       dataRelation: {
         label: 'Event id',
@@ -110,10 +110,10 @@ const RESOURCE_CONFIG = {
         keyFieldName: '_id',
         resourceType: 'Account'
       },
-      view: {title: [{key: 'label'}], subtitle: [{key: 'e-mail'}]},
+      // view: {title: [{key: 'label'}], subtitle: [{key: 'e-mail'}]},
       doNotUse: DO_NOT_USE,
-      subviews: [v.Detail, v.Lot, v.Package, v.Device],
-      subviewSmall: v.Detail,
+      // subviews: [v.Detail, v.Lot, v.Package, v.Device],
+      // subviewSmall: v.Detail,
       _root: true
     },
     Group: {
@@ -121,7 +121,6 @@ const RESOURCE_CONFIG = {
         fields: ['_id', 'label'],
         defaultFields: ['_id', 'label']
       },
-      subviewSmall: v.Detail,
       _root: true
     },
     Place: {
@@ -133,45 +132,45 @@ const RESOURCE_CONFIG = {
         resourceType: 'Place',
         keyFieldName: '_id'
       },
-      view: {title: [{key: 'label'}], subtitle: []},
-      subviews: [v.Lot, v.Place, v.Package, v.Pallet, v.Device, v.Event, v.Detail],
+      // view: {title: [{key: 'label'}], subtitle: []},
+      // subviews: [v.Lot, v.Place, v.Package, v.Pallet, v.Device, v.Event, v.Detail],
       doNotUse: GROUP_DO_NOT_USE
     },
-    Project: {
-      dataRelation: {
-        label: 'Identifier of the project',
-        labelFieldName: 'project',
-        filterFieldNames: ['project'],
-        fieldType: 'typeahead',
-        resourceType: 'Project'
-      }
-    },
-    Package: {
-      dataRelation: {
-        label: 'Name of the package',
-        labelFieldName: 'label',
-        filterFieldNames: ['label', '_id'],
-        fieldType: 'typeahead',
-        resourceType: 'Package',
-        keyFieldName: '_id'
-      },
-      view: {title: [{key: 'label'}], subtitle: []},
-      subviews: [v.Package, v.Device, v.Detail],
-      doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
-    },
-    Pallet: {
-      dataRelation: {
-        label: 'Name of the pallet',
-        labelFieldName: 'label',
-        filterFieldNames: ['label', '_id'],
-        fieldType: 'typeahead',
-        keyFieldName: '_id',
-        resourceType: 'Pallet'
-      },
-      view: {title: [{key: 'label'}], subtitle: []},
-      subviews: [v.Package, v.Device, v.Detail],
-      doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
-    },
+    // Project: {
+    //   dataRelation: {
+    //     label: 'Identifier of the project',
+    //     labelFieldName: 'project',
+    //     filterFieldNames: ['project'],
+    //     fieldType: 'typeahead',
+    //     resourceType: 'Project'
+    //   }
+    // },
+    // Package: {
+    //   dataRelation: {
+    //     label: 'Name of the package',
+    //     labelFieldName: 'label',
+    //     filterFieldNames: ['label', '_id'],
+    //     fieldType: 'typeahead',
+    //     resourceType: 'Package',
+    //     keyFieldName: '_id'
+    //   },
+    //   view: {title: [{key: 'label'}], subtitle: []},
+    //   subviews: [v.Package, v.Device, v.Detail],
+    //   doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
+    // },
+    // Pallet: {
+    //   dataRelation: {
+    //     label: 'Name of the pallet',
+    //     labelFieldName: 'label',
+    //     filterFieldNames: ['label', '_id'],
+    //     fieldType: 'typeahead',
+    //     keyFieldName: '_id',
+    //     resourceType: 'Pallet'
+    //   },
+    //   view: {title: [{key: 'label'}], subtitle: []},
+    //   subviews: [v.Package, v.Device, v.Detail],
+    //   doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
+    // },
     Lot: {
       dataRelation: {
         label: 'Name of the lot',
@@ -182,29 +181,29 @@ const RESOURCE_CONFIG = {
         resourceType: 'Lot'
       },
       view: {title: [{key: 'label'}], subtitle: [{key: '@type', humanize: true}]},
-      subviews: [v.Lot, v.Device, v.Detail],
-      doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
-    },
-    IncomingLot: {
-      dataRelation: {
-        label: 'Name of the input lot',
-        labelFieldName: 'label',
-        filterFieldNames: ['label', '_id'],
-        fieldType: 'typeahead',
-        keyFieldName: '_id'
-      },
-      doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
-    },
-    OutgoingLot: {
-      dataRelation: {
-        label: 'Name of the output lot',
-        labelFieldName: 'label',
-        filterFieldNames: ['label', '_id'],
-        fieldType: 'typeahead',
-        keyFieldName: '_id'
-      },
+      subviews: [v.Lot, v.Device],
       doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
     },
+    // IncomingLot: {
+    //   dataRelation: {
+    //     label: 'Name of the input lot',
+    //     labelFieldName: 'label',
+    //     filterFieldNames: ['label', '_id'],
+    //     fieldType: 'typeahead',
+    //     keyFieldName: '_id'
+    //   },
+    //   doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
+    // },
+    // OutgoingLot: {
+    //   dataRelation: {
+    //     label: 'Name of the output lot',
+    //     labelFieldName: 'label',
+    //     filterFieldNames: ['label', '_id'],
+    //     fieldType: 'typeahead',
+    //     keyFieldName: '_id'
+    //   },
+    //   doNotUse: GROUP_DO_NOT_USE.concat(['geo'])
+    // },
     Manufacturer: {
       dataRelation: {
         label: 'Name of the manufacturer',
@@ -215,10 +214,10 @@ const RESOURCE_CONFIG = {
       },
       _root: true
     }
-  },
-  inventory: {
-    subviews: [v.Lot, v.Device, v.Event]
   }
+  // inventory: {
+  //   subviews: [v.InventoryDashboard, v.Lot, v.Package, v.Device, v.Place, v.Pallet, v.Event]
+  // }
 }
 
 module.exports = RESOURCE_CONFIG
diff --git a/app/common/components/resource/resource-export/resource-export.directive.html b/app/common/components/resource/resource-export/resource-export.directive.html
index 4759465f..0b107a54 100644
--- a/app/common/components/resource/resource-export/resource-export.directive.html
+++ b/app/common/components/resource/resource-export/resource-export.directive.html
@@ -1,6 +1,6 @@
 <button type="button"
         class="btn"
-        ng-class="{'btn-primary': resources.length > 0}"
+        ng-class="{'btn-primary': selector.getAllSelectedDevices().length > 0}"
 
         uib-popover-template="popover.templateUrl"
         popover-title="{{::popover.title}}"
diff --git a/app/common/components/resource/resource-export/resource-export.directive.js b/app/common/components/resource/resource-export/resource-export.directive.js
index d981df77..6a35cb3d 100644
--- a/app/common/components/resource/resource-export/resource-export.directive.js
+++ b/app/common/components/resource/resource-export/resource-export.directive.js
@@ -8,14 +8,12 @@
  * @param {ResourceSettings} ResourceSettings
  * @param {SubmitForm} SubmitForm
  */
-function resourceExport (session, CONSTANTS, $http, ResourceSettings, SubmitForm) {
+function resourceExport (session, CONSTANTS, $http, ResourceSettings, SubmitForm, ResourceListSelector) {
   return {
     template: require('./resource-export.directive.html'),
     restrict: 'E',
-    scope: {
-      resources: '='
-    },
     link: $scope => {
+      $scope.selector = ResourceListSelector
       // Export popover
       $scope.isSafari = !!navigator.userAgent.match(/Version\/[\d\.]+.*Safari/)
       $scope.popover = {
@@ -69,17 +67,18 @@ function resourceExport (session, CONSTANTS, $http, ResourceSettings, SubmitForm
         ],
         model: {type: 'brief', format: 'ods'},
         submit: model => {
+          let resources = ResourceListSelector.getAllSelectedDevices()
           if (submitForm.isValid()) {
             submitForm.prepare()
             const saveAs = require('file-saver').saveAs
             const mimeType = MIME_TYPES[model.format]
-            const rSettings = ResourceSettings($scope.resources[0]['@type'])
+            const rSettings = ResourceSettings(resources[0]['@type'])
             const resource = rSettings.resourceName
             const promise = $http({
               method: 'GET',
               url: CONSTANTS.url + '/' + session.db + '/export/' + resource,
               params: {
-                ids: _.map($scope.resources, '_id'),
+                ids: _.map(resources, '_id'),
                 type: model.type
               },
               headers: {Accept: mimeType, Authorization: 'Basic ' + session.account.token},
diff --git a/app/common/components/resource/resource-label/label-button/label-button.directive.html b/app/common/components/resource/resource-label/label-button/label-button.directive.html
index e024c096..bd63d4e0 100644
--- a/app/common/components/resource/resource-label/label-button/label-button.directive.html
+++ b/app/common/components/resource/resource-label/label-button/label-button.directive.html
@@ -2,7 +2,7 @@
   type="button"
   class="btn "
   ng-click="openModal()"
-  ng-class="{'btn-primary': resources.length > 0}"
+  ng-class="{'btn-primary': selector.getAllSelectedDevices().length > 0}"
 >
   <i class="fa fa-tags fa-fw"></i>
   Label
diff --git a/app/common/components/resource/resource-label/label-button/label-button.directive.js b/app/common/components/resource/resource-label/label-button/label-button.directive.js
index 322d6d6b..65a2debb 100644
--- a/app/common/components/resource/resource-label/label-button/label-button.directive.js
+++ b/app/common/components/resource/resource-label/label-button/label-button.directive.js
@@ -1,12 +1,18 @@
-function labelButton (dhModal) {
+function labelButton (dhModal, ResourceListSelector) {
   return {
     template: require('./label-button.directive.html'),
     restrict: 'E',
-    scope: {
-      resources: '='
-    },
+    scope: {},
     link: $scope => {
-      $scope.openModal = () => dhModal.open('resourceLabel', {resources: () => $scope.resources})
+      $scope.selector = ResourceListSelector
+
+      $scope.openModal = () => {
+        dhModal.open('resourceLabel', {
+          resources: () => {
+            return ResourceListSelector.getAllSelectedDevices()
+          }
+        })
+      }
     }
   }
 }
diff --git a/app/common/components/resource/resource-label/label-edit/label-edit.directive.spec.js b/app/common/components/resource/resource-label/label-edit/label-edit.directive.spec.js
index 6c18ba1e..49d57c91 100644
--- a/app/common/components/resource/resource-label/label-edit/label-edit.directive.spec.js
+++ b/app/common/components/resource/resource-label/label-edit/label-edit.directive.spec.js
@@ -15,8 +15,6 @@ describe('Test label edit', () => {
   labelEdit.fields = []
 
   testLabelEdit(getJSONFixture('full-device.json'))
-  testLabelEdit(getJSONFixture('full-package.json'))
-  testLabelEdit(getJSONFixture('full-lot.json'))
   testLabelEdit(getJSONFixture('full-computer-monitor.json'))
   testLabelEdit(getJSONFixture('full-placeholder.json'))
 
diff --git a/app/common/components/resource/resource-list/no-more-pages-available.exception.js b/app/common/components/resource/resource-list/no-more-pages-available.exception.js
deleted file mode 100644
index 55719213..00000000
--- a/app/common/components/resource/resource-list/no-more-pages-available.exception.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const ExtendableError = require('es6-error')
-
-/**
- * Something violated the schema rules.
- */
-class NoMorePagesAvailableException extends ExtendableError {
-  constructor (message = 'There are not more pages available.') {
-    super(message)
-  }
-}
-
-module.exports = NoMorePagesAvailableException
diff --git a/app/common/components/resource/resource-list/resource-list-config.factory.js b/app/common/components/resource/resource-list/resource-list-config.factory.js
index 68a47546..7ea13a8d 100644
--- a/app/common/components/resource/resource-list/resource-list-config.factory.js
+++ b/app/common/components/resource/resource-list/resource-list-config.factory.js
@@ -10,12 +10,12 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
   // Typeaheads
   const deviceSettings = ResourceSettings('Device')
   const conditionRange = deviceSettings.schema.condition.schema.general.schema.range.allowed
-  const ACCOUNT_TYPEAHEAD = ResourceSettings('Account').getSetting('dataRelation')
+  // const ACCOUNT_TYPEAHEAD = ResourceSettings('Account').getSetting('dataRelation')
   const DEVICE_TYPEAHEAD = deviceSettings.getSetting('dataRelation')
   const LOT_TYPEAHEAD = ResourceSettings('Lot').getSetting('dataRelation')
-  const PACKAGE_TYPEAHEAD = ResourceSettings('Package').getSetting('dataRelation')
-  const PALLET_TYPEAHEAD = ResourceSettings('Pallet').getSetting('dataRelation')
-  const PLACE_TYPEAHEAD = ResourceSettings('Place').getSetting('dataRelation')
+  // const PACKAGE_TYPEAHEAD = ResourceSettings('Package').getSetting('dataRelation')
+  // const PALLET_TYPEAHEAD = ResourceSettings('Pallet').getSetting('dataRelation')
+  // const PLACE_TYPEAHEAD = ResourceSettings('Place').getSetting('dataRelation')
   const LAST_EVENT = {
     key: 'lastEvent',
     name: 'Last event is',
@@ -28,6 +28,7 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
   const f = {
     id: {th: {key: '_id', name: 'Id'}, td: {value: '_id'}},
     label: {th: {key: 'label', name: 'Label'}, td: {value: 'label', limitTo: 30}},
+    title: {th: {key: 'title', name: 'Title'}, td: {value: 'title', humanize: false}},
     '@type': {th: {key: '@type', name: 'Type'}, td: {value: '@type', humanize: true}},
     type: {th: {key: 'type', name: 'Subtype'}, td: {value: 'type', humanize: true}},
     from: {th: {key: 'from', name: 'From client'}, td: {value: 'from.name'}},
@@ -36,14 +37,21 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
     organization: {th: {key: 'organization', name: 'Organization'}, td: {value: 'organization'}},
     email: {th: {key: 'email', name: 'email'}, td: {value: 'email'}},
     updated: {th: {key: '_updated', name: 'Updated'}, td: {value: '_updated'}},
+    status: {
+      th: {key: 'status', name: 'Status'},
+      td: {value: 'status'}
+    },
     lastEvent: {
       th: {key: 'events._updated', name: 'Last event'},
       td: {templateUrl: configFolder + '/resource-button-device.html'}
     },
-    created: {th: {key: '_created', name: 'Created'}, td: {value: '_created'}},
+    created: {
+      th: {key: '_created', name: 'Created', cssClasses: 'hidden-xs'},
+      td: {value: '_created', cssClasses: 'hidden-xs'}
+    },
     range: {
-      th: {key: 'condition.general.score', name: 'Range'},
-      td: {templateUrl: configFolder + '/device-range.html'}
+      th: {key: 'condition.general.score', name: 'Range', cssClasses: 'hidden-xs'},
+      td: {templateUrl: configFolder + '/device-range.html', cssClasses: 'hidden-xs'}
     },
     model: {th: {key: 'model', name: 'Model'}, td: {value: 'model'}},
     state: {
@@ -52,10 +60,11 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
     },
     price: {
       th: {key: 'pricing.total.standard', name: `Price ${CONSTANTS.currency}`},
-      td: {value: 'pricing.total.standard', number: true}
+      td: {value: 'pricing.total.standard', currency: true}
     }
   }
   f.lastEvent.thDef = _.assign({default: true}, f.lastEvent.th)
+  f.status.thDef = _.assign({default: true}, f.status.th)
   f.updated.thDef = _.assign({default: true}, f.updated.th)
   const SNAPSHOT_SOFTWARE_ALLOWED = ['Workbench', 'AndroidApp', 'Web']
 
@@ -69,7 +78,9 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
 
   function getIsNotAncestor (resourceType, value) {
     const query = getIsAncestor(resourceType, value)
-    _.forEach(query, partial => { partial.ancestors = {$not: partial.ancestors} })
+    _.forEach(query, partial => {
+      partial.ancestors = {$not: partial.ancestors}
+    })
     return query
   }
 
@@ -80,27 +91,27 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
     comparison: '=',
     typeahead: LOT_TYPEAHEAD
   }
-  const INSIDE_PACKAGE = {
-    key: 'packageIsAncestor',
-    name: 'In package',
-    realKey: 'dh$insidePackage',
-    comparison: '=',
-    typeahead: PACKAGE_TYPEAHEAD
-  }
-  const INSIDE_PALLET = {
-    key: 'palletIsAncestor',
-    name: 'In pallet',
-    realKey: 'dh$insidePallet',
-    comparison: '=',
-    typeahead: PALLET_TYPEAHEAD
-  }
-  const INSIDE_PLACE = {
-    key: 'placeIsAncestor',
-    name: 'In place',
-    realKey: 'dh$insidePlace',
-    comparison: '=',
-    typeahead: PLACE_TYPEAHEAD
-  }
+  // const INSIDE_PACKAGE = {
+  //   key: 'packageIsAncestor',
+  //   name: 'In package',
+  //   realKey: 'dh$insidePackage',
+  //   comparison: '=',
+  //   typeahead: PACKAGE_TYPEAHEAD
+  // }
+  // const INSIDE_PALLET = {
+  //   key: 'palletIsAncestor',
+  //   name: 'In pallet',
+  //   realKey: 'dh$insidePallet',
+  //   comparison: '=',
+  //   typeahead: PALLET_TYPEAHEAD
+  // }
+  // const INSIDE_PLACE = {
+  //   key: 'placeIsAncestor',
+  //   name: 'In place',
+  //   realKey: 'dh$insidePlace',
+  //   comparison: '=',
+  //   typeahead: PLACE_TYPEAHEAD
+  // }
   const OUTSIDE_LOT = {
     key: 'lotIsNotAncestor',
     name: 'Out of lot',
@@ -114,7 +125,9 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
 
   function notAncestorOfType (groupType, RSettings) {
     const query = ancestorOfType(groupType, RSettings)
-    _.forEach(query, partial => { partial.ancestors = {$not: partial.ancestors} })
+    _.forEach(query, partial => {
+      partial.ancestors = {$not: partial.ancestors}
+    })
     return query
   }
 
@@ -153,13 +166,14 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
     }
   }
 
-  function hasGroupCallback (resourceName) {
-    const resourceType = Naming.type(resourceName)
-    return (where, ancestors) => {
-      const parents = _(ancestors).filter({'@type': resourceType}).flatMapDeep('_id').value()
-      where['_id'] = {'$in': _(ancestors).flatMapDeep(resourceName).concat(parents).uniq().value()}
-    }
-  }
+  /* function hasGroupCallback (resourceName) {
+     const resourceType = Naming.type(resourceName)
+     return (where, ancestors) => {
+       const parents = _(ancestors).filter({'@type': resourceType}).flatMapDeep('_id').value()
+       where['_id'] = {'$in': _(ancestors).flatMapDeep(resourceName).concat(parents).uniq().value()}
+     }
+   }
+   */
 
   // We use the typeahead to retrieve us the ancestors of the device :-)
   // todo ^ makes to show [object Object] in the typeahead field
@@ -169,527 +183,561 @@ function resourceListConfig (RESOURCE_SEARCH, ResourceSettings, CONSTANTS, schem
     name: 'Has lot',
     typeahead: _.assign({}, LOT_TYPEAHEAD, {keyFieldName: 'ancestors'})
   }
-  const HAS_PACKAGE = {
-    key: 'hasPackage',
-    name: 'Has Package',
-    typeahead: _.assign({}, PACKAGE_TYPEAHEAD, {keyFieldName: 'ancestors'})
-  }
+  // const HAS_PACKAGE = {
+  //   key: 'hasPackage',
+  //   name: 'Has Package',
+  //   typeahead: _.assign({}, PACKAGE_TYPEAHEAD, {keyFieldName: 'ancestors'})
+  // }
   const HAS_DEVICE = {
     key: 'hasDevice',
     name: 'Has Device',
     typeahead: _.assign({}, DEVICE_TYPEAHEAD, {keyFieldName: 'ancestors'})
   }
-  const HAS_PLACE = {
-    key: 'hasPlace',
-    name: 'Has Place',
-    typeahead: _.assign({}, PLACE_TYPEAHEAD, {keyFieldName: 'ancestors'})
-  }
+  // const HAS_PLACE = {
+  //   key: 'hasPlace',
+  //   name: 'Has Place',
+  //   typeahead: _.assign({}, PLACE_TYPEAHEAD, {keyFieldName: 'ancestors'})
+  // }
 
   return {
-    views: {
-      default: { // This is not used, but provided as a template
-        search: {
-          params: RESOURCE_SEARCH.params,
-          defaultParams: {'@type': 'Computer'},
-          // subview (parent-resource is set)
+    search: {
+      params: RESOURCE_SEARCH.params.concat([
+        // {key: 'label', name: 'Label', placeholder: 'Label...', realKey: 'labelId'},
+        {
+          key: '@type',
+          name: 'Type of device',
+          select: 'Device',
+          comparison: '=',
+          description: 'The type of the device: Computer, Mobile, Computer monitor...'
         },
-        buttons: {
-          templateUrl: ''
+        {
+          key: 'pid',
+          name: 'Pid',
+          placeholder: 'The Platform Identifier...'
         },
-        table: {
-          // th and td need to share the same order
-          th: [{key: '', name: ''}],
-          td: [{value: ''}, {templateUrl: ''}]
-        }
-      },
-      Device: {
-        search: {
-          params: RESOURCE_SEARCH.params.concat([
-            {key: 'label', name: 'Label', placeholder: 'Label...', realKey: 'labelId'},
-            {
-              key: '@type',
-              name: 'Type of device',
-              select: 'Device',
-              comparison: '=',
-              description: 'The type of the device: Computer, Mobile, Computer monitor...'
-            },
-            {
-              key: 'pid',
-              name: 'Pid',
-              placeholder: 'The Platform Identifier...'
-            },
-            {
-              key: 'gid',
-              name: 'Gid',
-              placeholder: 'The Giver Identifier...'
-            },
-            {
-              key: 'rid',
-              name: 'Rid',
-              placeholder: 'The Refurbisher Identifier...'
-            },
-            {
-              key: 'type',
-              name: 'Subtype of device',
-              select: _(schema.schema)  // We get all subtypes of devices
-                .filter((r, n) => _.isObject(r) && 'type' in r && _.includes(deviceSettings.types, Naming.type(n)))
-                .flatMap(r => r['type']['allowed'])
-                .uniq()
-                .value(),
-              comparison: '=',
-              description: 'Subtypes of devices...'
-            },
-            {key: 'serialNumber', name: 'Serial Number', placeholder: 'S/N...'},
-            {key: 'model', name: 'Model', placeholder: 'Vaio...'},
-            {key: 'manufacturer', name: 'Manufacturer', placeholder: 'Apple...'},
-            {key: 'parent', name: 'Components of', placeholder: 'Identifier of the computer'},
-            // { key: 'totalMemory', name: 'Total of RAM', placeholder: 'In Gigabytes...'},
-            // { key: 'event', name: 'Type of event', placeholder: 'Devices with this event...'}, todo
-            // { key: 'byUser', name: 'Author', placeholder: 'email or name of the author...'}, // todo
-            // { key: '_created', name: 'Registered in', placeholder: 'YYYY-MM-DD' },
-            // { key: '_updated', name: 'Last updated in', placeholder: 'YYYY-MM-DD'},
-            {
-              key: 'public',
-              name: 'Is public',
-              select: ['Yes', 'No'],
-              boolean: true,
-              comparison: '=',
-              description: 'Match devices that have a public link.'
-            },
-            {
-              key: 'event',
-              name: 'Has event of type',
-              select: 'devices:DeviceEvent',
-              comparison: '=',
-              realKey: 'events.@type',
-              description: 'Match only devices that have a specific type of event.'
-            },
-            {
-              key: 'event_id',
-              name: 'Has event',
-              realKey: 'events._id',
-              placeholder: 'ID of event',
-              comparison: '=',
-              description: 'Match only devices that have a specific event.'
-            },
-            LAST_EVENT,
-            {
-              key: 'eventIncidence',
-              name: 'Has an incidence',
-              realKey: 'events.incidence',
-              select: ['Yes', 'No'],
-              boolean: true,
-              comparison: '='
-            },
-            {
-              key: 'eventUpdatedBefore',
-              name: 'Event performed before or eq',
-              date: true,
-              comparison: '<=',
-              placeholder: h.datePlaceholder,
-              realKey: 'events._updated'
-            },
-            {
-              key: 'eventUpdatedAfter',
-              name: 'Event performed after or eq',
-              date: true,
-              comparison: '>=',
-              placeholder: h.datePlaceholder,
-              realKey: 'events._updated'
-            },
-            {
-              key: 'erase',
-              name: 'Erasure has',
-              realKey: 'events.success', // todo this works because success field is only for erasures
-              select: ['Succeed', 'Failed'],
-              boolean: true,
-              comparison: '=',
-              description: 'Computers or their hard-drives that have such erasures.'
-            },
-            {
-              key: 'receiver',
-              name: 'Receiver',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              realKey: 'events.receiver',
-              comparison: '=',
-              placeholder: 'Type an e-mail',
-              description: 'Match devices that were given to a specific user.'
-            },
-            {
-              key: 'to',
-              name: 'Assigned to',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              realKey: 'events.to',
-              comparison: '=',
-              placeholder: 'Type an e-mail',
-              description: 'Match devices that were assigned to a specific user.'
-            },
-            {
-              key: 'from',
-              name: 'Deassigned from',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              placeholder: 'Type an e-mail',
-              realKey: 'events.to',
-              comparison: '=',
-              description: 'Match devices that were de-assigned from a specific user.'
-            },
-            {
-              key: 'own',
-              name: 'Owns',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              realKey: 'owners',
-              comparison: 'in',
-              placeholder: 'Type an e-mail',
-              description: 'Match devices that are actually assigned to a specific user.'
-            },
-            {
-              key: 'not-own',
-              name: 'Does not own',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              realKey: 'owners',
-              comparison: 'nin',
-              placeholder: 'Type an e-mail',
-              description: 'Match devices that are actually not assigned to a specific user.'
-            },
-            INSIDE_LOT,
-            OUTSIDE_LOT,
-            INSIDE_PACKAGE,
-            INSIDE_PLACE,
-            INSIDE_PALLET,
-            GROUP_INCLUSION,
-            OUTSIDE_GROUP,
-            {
-              key: 'snapshot-software',
-              name: 'Has a Snapshot made with',
-              realKey: 'events.snapshotSoftware',
-              select: SNAPSHOT_SOFTWARE_ALLOWED,
-              comparison: '=',
-              description: 'The device has a Snapshot made with a specific software.'
-            },
-            {
-              key: 'not-snapshot-software',
-              name: 'Has not a Snapshot made with',
-              realKey: 'events.snapshotSoftware',
-              select: SNAPSHOT_SOFTWARE_ALLOWED,
-              comparison: '!=',
-              description: 'The device has not a Snapshot made with a specific software.'
-            },
-            {
-              key: 'event-label',
-              realKey: 'events.label',
-              name: 'Label of the event',
-              placeholder: 'Start writing the label...',
-              description: 'The name the user wrote in the event.'
-            },
-            {
-              key: 'placeholder',
-              name: 'Is Placeholder',
-              select: ['Yes', 'No'],
-              boolean: true,
-              comparison: '=',
-              description: 'Match devices that are placeholders.'
-            },
-            {
-              key: 'not-event',
-              name: 'Has not event',
-              select: 'devices:DeviceEvent',
-              comparison: '!=',
-              realKey: 'events.@type',
-              description: 'Match only devices that have not a specific type of event. Example: devices not ready.'
-            },
-            {
-              key: 'is-component',
-              name: 'Is component',
-              realKey: '@type',
-              select: ['Yes', 'No'],
-              boolean: true,
-              comparison: (value, RSettings) => ({[value ? '$in' : '$nin']: RSettings('Component').subResourcesNames}),
-              description: 'Match devices depending if they are components or not.'
-            },
-            {
-              key: 'active',
-              name: 'Active',
-              realKey: 'dh$active',
-              select: ['Yes', 'No'],
-              boolean: true,
-              comparison: '=',
-              description: 'Match devices that are not recycled, disposed, a final user received, or moved to another inventory.'
-            },
-            {
-              key: 'rangeIsAtLeast',
-              name: 'Range is at least',
-              realKey: 'condition.general.range',
-              select: conditionRange,
-              comparison: value => ({$nin: _.takeWhile(conditionRange, v => v !== value), $ne: null}),
-              description: 'Match devices that are of range or above.'
-            },
-            {
-              key: 'rangeIs',
-              name: 'Range is',
-              realKey: 'condition.general.range',
-              select: conditionRange,
-              comparison: '=',
-              description: 'Match devices that are of range.'
-            },
-            {
-              key: 'rangeIsAtMost',
-              name: 'Range is at most',
-              realKey: 'condition.general.range',
-              select: conditionRange,
-              comparison: value => ({'$nin': _.takeRightWhile(conditionRange, v => v !== value)}),
-              description: 'Match devices that are of range or below.'
-            },
-            {
-              key: 'pricing.total.standard',
-              name: 'Price is at most',
-              comparison: '<=',
-              number: true
-            },
-            {
-              key: 'pricing.total.standard',
-              name: 'Price is at least',
-              comparison: '>=',
-              number: true
-            }
-          ]),
-          defaultParams: {'is-component': 'No', 'active': 'Yes'},
-          subResource: {
-            Event: {key: 'device', field: '_id'}
-          }
+        {
+          key: 'gid',
+          name: 'Gid',
+          placeholder: 'The Giver Identifier...'
         },
-        buttons: {
-          templateUrl: configFolder + '/resource-list-config-device'
+        {
+          key: 'rid',
+          name: 'Rid',
+          placeholder: 'The Refurbisher Identifier...'
         },
-        table: {
-          th: [f.id.th, f['@type'].th, f.type.th, f.model.th, f.price.th, f.range.th, f.lastEvent.thDef, f.created.th],
-          td: [f.id.td, f['@type'].td, f.type.td, f.model.td, f.price.td, f.range.td, f.lastEvent.td, f.created.td]
-        }
-      },
-      Lot: {
-        search: {
-          params: RESOURCE_SEARCH.params.concat([
-            {
-              key: '@type',
-              name: 'Type',
-              select: 'Lot',
-              comparison: '=',
-              description: 'The type of the lot'
-            },
-            _.assign({}, HAS_DEVICE, {
-              callback: hasGroupCallback('lots'),
-              description: 'Find lots that have a specific device.'
-            }),
-            _.assign({}, HAS_LOT, {
-              callback: hasGroupCallback('lots'),
-              description: 'Find lots that have a specific lot.'
-            }),
-            _.assign({}, HAS_PACKAGE, {
-              callback: hasGroupCallback('lots'),
-              description: 'Find lots that have a specific package.'
-            }),
-            {
-              key: 'to',
-              name: 'Assigned to account / client',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              realKey: 'to.email',
-              comparison: '=',
-              placeholder: 'Type an e-mail',
-              description: 'Match Output lots that are assigned to a client.'
-            },
-            {
-              key: 'from',
-              name: 'From account / client',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              placeholder: 'Type an e-mail',
-              realKey: 'from.email',
-              comparison: '=',
-              description: 'Match Input Lots that come from a client.'
-            },
-            LAST_EVENT,
-            INSIDE_PLACE,
-            INSIDE_LOT,
-            OUTSIDE_LOT,
-            GROUP_INCLUSION,
-            OUTSIDE_GROUP
-          ]),
-          defaultParams: {},
-          subResource: {
-            Device: {key: 'lotIsAncestor', field: '_id'},
-            Package: {key: 'lotIsAncestor', field: '_id'},
-            Lot: {key: 'lotIsAncestor', field: '_id'},
-            Pallet: {key: 'lotIsAncestor', field: '_id'}
-          }
+        {
+          key: 'type',
+          name: 'Subtype of device',
+          select: _(schema.schema)  // We get all subtypes of devices
+            .filter((r, n) => _.isObject(r) && 'type' in r && _.includes(deviceSettings.types, Naming.type(n)))
+            .flatMap(r => r['type']['allowed'])
+            .uniq()
+            .value(),
+          comparison: '=',
+          description: 'Subtypes of devices...'
         },
-        buttons: {
-          templateUrl: configFolder + '/resource-list-config-group'
+        {key: 'serialNumber', name: 'Serial Number', placeholder: 'S/N...'},
+        {key: 'model', name: 'Model', placeholder: 'Vaio...'},
+        {key: 'manufacturer', name: 'Manufacturer', placeholder: 'Apple...'},
+        {key: 'parent', name: 'Components of', placeholder: 'Identifier of the computer'},
+        // { key: 'totalMemory', name: 'Total of RAM', placeholder: 'In Gigabytes...'},
+        // { key: 'event', name: 'Type of event', placeholder: 'Devices with this event...'}, todo
+        // { key: 'byUser', name: 'Author', placeholder: 'email or name of the author...'}, // todo
+        // { key: '_created', name: 'Registered in', placeholder: 'YYYY-MM-DD' },
+        // { key: '_updated', name: 'Last updated in', placeholder: 'YYYY-MM-DD'},
+        // {
+        //   key: 'public',
+        //   name: 'Is public',
+        //   select: ['Yes', 'No'],
+        //   boolean: true,
+        //   comparison: '=',
+        //   description: 'Match devices that have a public link.'
+        // },
+        {
+          key: 'event',
+          name: 'Has event of type',
+          select: 'devices:DeviceEvent',
+          comparison: '=',
+          realKey: 'events.@type',
+          description: 'Match only devices that have a specific type of event.'
         },
-        table: {
-          th: [f.id.th, f.label.th, f['@type'].th, f.from.th, f.to.th, f.lastEvent.th, f.updated.thDef],
-          td: [f.id.td, f.label.td, f['@type'].td, f.from.td, f.to.td, f.lastEvent.td, f.updated.td]
-        }
-      },
-      Package: {
-        search: {
-          params: RESOURCE_SEARCH.params.concat([
-            INSIDE_LOT,
-            OUTSIDE_LOT,
-            INSIDE_PLACE,
-            INSIDE_PACKAGE,
-            INSIDE_PALLET,
-            GROUP_INCLUSION,
-            OUTSIDE_GROUP,
-            _.assign({}, HAS_DEVICE, {
-              callback: hasGroupCallback('packages'),
-              description: 'Find packages that have a specific device.'
-            })
-          ]),
-          defaultParams: {},
-          subResource: {
-            Device: {key: 'packageIsAncestor', field: '_id'},
-            Package: {key: 'packageIsAncestor', field: '_id'}
-          }
+        {
+          key: 'event_id',
+          name: 'Has event',
+          realKey: 'events._id',
+          placeholder: 'ID of event',
+          comparison: '=',
+          description: 'Match only devices that have a specific event.'
         },
-        buttons: {
-          templateUrl: configFolder + '/resource-list-config-group'
+        LAST_EVENT,
+        // {
+        //   key: 'eventIncidence',
+        //   name: 'Has an incidence',
+        //   realKey: 'events.incidence',
+        //   select: ['Yes', 'No'],
+        //   boolean: true,
+        //   comparison: '='
+        // },
+        {
+          key: 'eventUpdatedBefore',
+          name: 'Event performed before or eq',
+          date: true,
+          comparison: '<=',
+          placeholder: h.datePlaceholder,
+          realKey: 'events._updated'
         },
-        table: {
-          th: [f.id.th, f.label.th, f.lastEvent.th, f.updated.thDef],
-          td: [f.id.td, f.label.td, f.lastEvent.td, f.updated.td]
-        }
-      },
-      Pallet: {
-        search: {
-          params: RESOURCE_SEARCH.params.concat([
-            INSIDE_LOT,
-            OUTSIDE_LOT,
-            INSIDE_PLACE,
-            GROUP_INCLUSION,
-            OUTSIDE_GROUP,
-            _.assign({}, HAS_DEVICE, {
-              callback: hasGroupCallback('pallets'),
-              description: 'Find pallets that have a specific device.'
-            })
-          ]),
-          defaultParams: {},
-          subResource: {
-            Device: {key: 'palletIsAncestor', field: '_id'},
-            Package: {key: 'palletIsAncestor', field: '_id'}
-          }
+        {
+          key: 'eventUpdatedAfter',
+          name: 'Event performed after or eq',
+          date: true,
+          comparison: '>=',
+          placeholder: h.datePlaceholder,
+          realKey: 'events._updated'
         },
-        buttons: {
-          templateUrl: configFolder + '/resource-list-config-group'
+        {
+          key: 'erase',
+          name: 'Erasure has',
+          realKey: 'events.success', // todo this works because success field is only for erasures
+          select: ['Succeed', 'Failed'],
+          boolean: true,
+          comparison: '=',
+          description: 'Computers or their hard-drives that have such erasures.'
         },
-        table: {
-          th: [f.id.th, f.label.th, f.lastEvent.th, f.updated.thDef, {key: 'size', name: 'Size'}],
-          td: [f.id.td, f.label.td, f.lastEvent.td, f.updated.td, {templateUrl: configFolder + '/pallet-size.html'}]
-        }
-      },
-      Place: {
-        search: {
-          params: RESOURCE_SEARCH.params.concat([
-            INSIDE_PLACE,
-            _.assign({}, HAS_PACKAGE, {
-              callback: hasGroupCallback('places'),
-              description: 'Find packages that have a specific package.'
-            }),
-            _.assign({}, HAS_LOT, {
-              callback: hasGroupCallback('places'),
-              description: 'Find places that have a specific lot.'
-            }),
-            _.assign({}, HAS_DEVICE, {
-              callback: hasGroupCallback('places'),
-              description: 'Find places that have a specific device.'
-            }),
-            _.assign({}, HAS_PLACE, {
-              callback: hasGroupCallback('places'),
-              description: 'Find places that have a specific place.'
-            })
-          ]),
-          defaultParams: {},
-          subResource: {
-            Device: {key: 'placeIsAncestor', field: '_id'},
-            Place: {key: 'placeIsAncestor', field: '_id'},
-            Lot: {key: 'placeIsAncestor', field: '_id'},
-            Package: {key: 'placeIsAncestor', field: '_id'},
-            Pallet: {key: 'placeIsAncestor', field: '_id'},
-            Event: {key: 'place', field: '_id'}
-          }
+        // {
+        //   key: 'receiver',
+        //   name: 'Receiver',
+        //   typeahead: ACCOUNT_TYPEAHEAD,
+        //   realKey: 'events.receiver',
+        //   comparison: '=',
+        //   placeholder: 'Type an e-mail',
+        //   description: 'Match devices that were given to a specific user.'
+        // },
+        // {
+        //   key: 'to',
+        //   name: 'Assigned to',
+        //   typeahead: ACCOUNT_TYPEAHEAD,
+        //   realKey: 'events.to',
+        //   comparison: '=',
+        //   placeholder: 'Type an e-mail',
+        //   description: 'Match devices that were assigned to a specific user.'
+        // },
+        // {
+        //   key: 'from',
+        //   name: 'Deassigned from',
+        //   typeahead: ACCOUNT_TYPEAHEAD,
+        //   placeholder: 'Type an e-mail',
+        //   realKey: 'events.to',
+        //   comparison: '=',
+        //   description: 'Match devices that were de-assigned from a specific user.'
+        // },
+        // {
+        //   key: 'own',
+        //   name: 'Owns',
+        //   typeahead: ACCOUNT_TYPEAHEAD,
+        //   realKey: 'owners',
+        //   comparison: 'in',
+        //   placeholder: 'Type an e-mail',
+        //   description: 'Match devices that are actually assigned to a specific user.'
+        // },
+        // {
+        //   key: 'not-own',
+        //   name: 'Does not own',
+        //   typeahead: ACCOUNT_TYPEAHEAD,
+        //   realKey: 'owners',
+        //   comparison: 'nin',
+        //   placeholder: 'Type an e-mail',
+        //   description: 'Match devices that are actually not assigned to a specific user.'
+        // },
+        // INSIDE_LOT,
+        // OUTSIDE_LOT,
+        // INSIDE_PACKAGE,
+        // INSIDE_PLACE,
+        // INSIDE_PALLET,
+        // GROUP_INCLUSION,
+        // OUTSIDE_GROUP,
+        // {
+        //   key: 'snapshot-software',
+        //   name: 'Has a Snapshot made with',
+        //   realKey: 'events.snapshotSoftware',
+        //   select: SNAPSHOT_SOFTWARE_ALLOWED,
+        //   comparison: '=',
+        //   description: 'The device has a Snapshot made with a specific software.'
+        // },
+        // {
+        //   key: 'not-snapshot-software',
+        //   name: 'Has not a Snapshot made with',
+        //   realKey: 'events.snapshotSoftware',
+        //   select: SNAPSHOT_SOFTWARE_ALLOWED,
+        //   comparison: '!=',
+        //   description: 'The device has not a Snapshot made with a specific software.'
+        // },
+        {
+          key: 'event-label',
+          realKey: 'events.label',
+          name: 'Label of the event',
+          placeholder: 'Start writing the label...',
+          description: 'The name the user wrote in the event.'
         },
-        buttons: {
-          templateUrl: configFolder + '/resource-list-config-group'
+        {
+          key: 'placeholder',
+          name: 'Is Placeholder',
+          select: ['Yes', 'No'],
+          boolean: true,
+          comparison: '=',
+          description: 'Match devices that are placeholders.'
         },
-        table: {
-          th: [f.label.th, f.lastEvent.th, f.updated.thDef],
-          td: [f.label.td, f.lastEvent.td, f.updated.td]
-        }
-      },
-      Event: {
-        search: {
-          params: RESOURCE_SEARCH.params.concat([
-            {
-              key: '@type',
-              name: 'Type',
-              select: 'Event',
-              comparison: '=',
-              description: 'The type of event'
-            },
-            {
-              key: 'device',
-              name: 'Event of device',
-              realKey: 'dh$eventOfDevice',
-              typeahead: DEVICE_TYPEAHEAD,
-              comparison: '=',
-              placeholder: 'System ID of the device.'
-            },
-            {
-              key: 'place',
-              name: 'Event made in place',
-              typeahead: PLACE_TYPEAHEAD,
-              comparison: '=',
-              description: 'The name of the place where the event has been done'
-            }
-          ]),
-          defaultParams: {},
-          subResource: {
-            Device: {key: 'event_id', field: '_id'}
-          }
+        {
+          key: 'not-event',
+          name: 'Has not event',
+          select: 'devices:DeviceEvent',
+          comparison: '!=',
+          realKey: 'events.@type',
+          description: 'Match only devices that have not a specific type of event. Example: devices not ready.'
         },
-        buttons: {
-          templateUrl: configFolder + '/resource-list-config-event'
+        {
+          key: 'is-component',
+          name: 'Is component',
+          realKey: '@type',
+          select: ['Yes', 'No'],
+          boolean: true,
+          comparison: (value, RSettings) => ({[value ? '$in' : '$nin']: RSettings('Component').subResourcesNames}),
+          description: 'Match devices depending if they are components or not.'
         },
-        table: {
-          th: [f.id.th, f.label.th, f['@type'].th, f.state.th, f.updated.thDef],
-          td: [f.id.td, f.label.td, f['@type'].td, f.state.td, f.updated.td]
-        }
-      },
-      Account: {
-        search: {
-          params: RESOURCE_SEARCH.params.concat([
-            {
-              key: 'email',
-              name: 'email',
-              typeahead: ACCOUNT_TYPEAHEAD,
-              comparison: '=',
-              description: 'Match account by their e-mail.'
-            },
-            {
-              key: 'organization',
-              name: 'Organization',
-              comparison: '=',
-              description: 'Match accounts by the organization they are in.'
-            }
-          ]),
-          defaultParams: {}
+        {
+          key: 'active',
+          name: 'Active',
+          realKey: 'dh$active',
+          select: ['Yes', 'No'],
+          boolean: true,
+          comparison: '=',
+          description: 'Match devices that are not recycled, disposed, a final user received, or moved to another inventory.'
+        },
+        {
+          key: 'rangeIsAtLeast',
+          name: 'Range is at least',
+          realKey: 'condition.general.range',
+          select: conditionRange,
+          comparison: value => ({$nin: _.takeWhile(conditionRange, v => v !== value), $ne: null}),
+          description: 'Match devices that are of range or above.'
+        },
+        // {
+        //   key: 'rangeIs',
+        //   name: 'Range is',
+        //   realKey: 'condition.general.range',
+        //   select: conditionRange,
+        //   comparison: '=',
+        //   description: 'Match devices that are of range.'
+        // },
+        {
+          key: 'rangeIsAtMost',
+          name: 'Range is at most',
+          realKey: 'condition.general.range',
+          select: conditionRange,
+          comparison: value => ({'$nin': _.takeRightWhile(conditionRange, v => v !== value)}),
+          description: 'Match devices that are of range or below.'
         },
-        buttons: {
-          templateUrl: configFolder + '/resource-list-config-account'
+        {
+          key: 'pricing.total.standard',
+          name: 'Price is at most',
+          comparison: '<=',
+          number: true
         },
-        table: {
-          th: [f.email.th, f.name.th, f.organization.th, f.updated.thDef],
-          td: [f.email.td, f.name.td, f.organization.td, f.updated.td]
+        {
+          key: 'pricing.total.standard',
+          name: 'Price is at least',
+          comparison: '>=',
+          number: true
         }
+      ]),
+      defaultParams: {'is-component': 'No', 'active': 'Yes'},
+      subResource: {
+        Event: {key: 'device', field: '_id'}
       }
+    },
+    table: {
+      th: [f.id.th, f.title.th, f.price.th, f.range.th, f.status.thDef, f.created.th],
+      td: [f.id.td, f.title.td, f.price.td, f.range.td, f.status.td, f.created.td]
+    },
+    tableEvents: {
+      th: [
+        {
+          key: 'Event',
+          name: 'Event'
+        },
+        {
+          key: 'Id',
+          name: 'Id',
+          cssClasses: 'hidden-xs'
+        },
+        {
+          key: 'Label',
+          name: 'Label',
+          cssClasses: 'hidden-xs'
+        },
+        {
+          key: 'State',
+          name: 'State',
+          cssClasses: 'hidden-xs'
+        },
+        {
+          key: 'Updated',
+          name: 'Updated'
+        }
+      ],
+      td: [f.id.td, f.title.td, f.price.td, f.range.td, f.status.td, f.created.td]
     }
+//     Lot:{
+//     search: {
+//       params: RESOURCE_SEARCH.params.concat([
+//         {
+//           key: '@type',
+//           name: 'Type',
+//           select: 'Lot',
+//           comparison: '=',
+//           description: 'The type of the lot'
+//         },
+//         _.assign({}, HAS_DEVICE, {
+//           callback: hasGroupCallback('lots'),
+//           description: 'Find lots that have a specific device.'
+//         }),
+//         _.assign({}, HAS_LOT, {
+//           callback: hasGroupCallback('lots'),
+//           description: 'Find lots that have a specific lot.'
+//         }),
+//         _.assign({}, HAS_PACKAGE, {
+//           callback: hasGroupCallback('lots'),
+//           description: 'Find lots that have a specific package.'
+//         }),
+//         {
+//           key: 'to',
+//           name: 'Assigned to account / client',
+//           typeahead: ACCOUNT_TYPEAHEAD,
+//           realKey: 'to.email',
+//           comparison: '=',
+//           placeholder: 'Type an e-mail',
+//           description: 'Match Output lots that are assigned to a client.'
+//         },
+//         {
+//           key: 'from',
+//           name: 'From account / client',
+//           typeahead: ACCOUNT_TYPEAHEAD,
+//           placeholder: 'Type an e-mail',
+//           realKey: 'from.email',
+//           comparison: '=',
+//           description: 'Match Input Lots that come from a client.'
+//         },
+//         LAST_EVENT,
+//         INSIDE_PLACE,
+//         INSIDE_LOT,
+//         OUTSIDE_LOT,
+//         GROUP_INCLUSION,
+//         OUTSIDE_GROUP
+//       ]),
+//         defaultParams
+//     :
+//       {
+//       }
+//     ,
+//       subResource: {
+//         Device: {
+//           key: 'lotIsAncestor', field
+//         :
+//           '_id'
+//         }
+//       ,
+//         Package: {
+//           key: 'lotIsAncestor', field
+//         :
+//           '_id'
+//         }
+//       ,
+//         Lot: {
+//           key: 'lotIsAncestor', field
+//         :
+//           '_id'
+//         }
+//       ,
+//         Pallet: {
+//           key: 'lotIsAncestor', field
+//         :
+//           '_id'
+//         }
+//       }
+//     }
+//   ,
+//     buttons: {
+//       templateUrl: configFolder + '/resource-list-config-group'
+//     }
+//   ,
+//     table: {
+//       th: [f.id.th, f.label.th, f['@type'].th, f.from.th, f.to.th, f.lastEvent.th, f.updated.thDef],
+//         td
+//     :
+//       [f.id.td, f.label.td, f['@type'].td, f.from.td, f.to.td, f.lastEvent.td, f.updated.td]
+//     }
+//   }
+// ,
+  // Package: {
+  //   search: {
+  //     params: RESOURCE_SEARCH.params.concat([
+  //       INSIDE_LOT,
+  //       OUTSIDE_LOT,
+  //       INSIDE_PLACE,
+  //       INSIDE_PACKAGE,
+  //       INSIDE_PALLET,
+  //       GROUP_INCLUSION,
+  //       OUTSIDE_GROUP,
+  //       _.assign({}, HAS_DEVICE, {
+  //         callback: hasGroupCallback('packages'),
+  //         description: 'Find packages that have a specific device.'
+  //       })
+  //     ]),
+  //     defaultParams: {},
+  //     subResource: {
+  //       Device: {key: 'packageIsAncestor', field: '_id'},
+  //       Package: {key: 'packageIsAncestor', field: '_id'}
+  //     }
+  //   },
+  //   buttons: {
+  //     templateUrl: configFolder + '/resource-list-config-group'
+  //   },
+  //   table: {
+  //     th: [f.id.th, f.label.th, f.lastEvent.th, f.updated.thDef],
+  //     td: [f.id.td, f.label.td, f.lastEvent.td, f.updated.td]
+  //   }
+  // },
+  // Pallet: {
+  //   search: {
+  //     params: RESOURCE_SEARCH.params.concat([
+  //       INSIDE_LOT,
+  //       OUTSIDE_LOT,
+  //       INSIDE_PLACE,
+  //       GROUP_INCLUSION,
+  //       OUTSIDE_GROUP,
+  //       _.assign({}, HAS_DEVICE, {
+  //         callback: hasGroupCallback('pallets'),
+  //         description: 'Find pallets that have a specific device.'
+  //       })
+  //     ]),
+  //     defaultParams: {},
+  //     subResource: {
+  //       Device: {key: 'palletIsAncestor', field: '_id'},
+  //       Package: {key: 'palletIsAncestor', field: '_id'}
+  //     }
+  //   },
+  //   buttons: {
+  //     templateUrl: configFolder + '/resource-list-config-group'
+  //   },
+  //   table: {
+  //     th: [f.id.th, f.label.th, f.lastEvent.th, f.updated.thDef, {key: 'size', name: 'Size'}],
+  //     td: [f.id.td, f.label.td, f.lastEvent.td, f.updated.td, {templateUrl: configFolder + '/pallet-size.html'}]
+  //   }
+  // },
+  // Place: {
+  //   search: {
+  //     params: RESOURCE_SEARCH.params.concat([
+  //       INSIDE_PLACE,
+  //       _.assign({}, HAS_PACKAGE, {
+  //         callback: hasGroupCallback('places'),
+  //         description: 'Find packages that have a specific package.'
+  //       }),
+  //       _.assign({}, HAS_LOT, {
+  //         callback: hasGroupCallback('places'),
+  //         description: 'Find places that have a specific lot.'
+  //       }),
+  //       _.assign({}, HAS_DEVICE, {
+  //         callback: hasGroupCallback('places'),
+  //         description: 'Find places that have a specific device.'
+  //       }),
+  //       _.assign({}, HAS_PLACE, {
+  //         callback: hasGroupCallback('places'),
+  //         description: 'Find places that have a specific place.'
+  //       })
+  //     ]),
+  //     defaultParams: {},
+  //     subResource: {
+  //       Device: {key: 'placeIsAncestor', field: '_id'},
+  //       Place: {key: 'placeIsAncestor', field: '_id'},
+  //       Lot: {key: 'placeIsAncestor', field: '_id'},
+  //       Package: {key: 'placeIsAncestor', field: '_id'},
+  //       Pallet: {key: 'placeIsAncestor', field: '_id'},
+  //       Event: {key: 'place', field: '_id'}
+  //     }
+  //   },
+  //   buttons: {
+  //     templateUrl: configFolder + '/resource-list-config-group'
+  //   },
+  //   table: {
+  //     th: [f.label.th, f.lastEvent.th, f.updated.thDef],
+  //     td: [f.label.td, f.lastEvent.td, f.updated.td]
+  //   }
+  // },
+  // Event: {
+  //   search: {
+  //     params: RESOURCE_SEARCH.params.concat([
+  //       {
+  //         key: '@type',
+  //         name: 'Type',
+  //         select: 'Event',
+  //         comparison: '=',
+  //         description: 'The type of event'
+  //       },
+  //       {
+  //         key: 'device',
+  //         name: 'Event of device',
+  //         realKey: 'dh$eventOfDevice',
+  //         typeahead: DEVICE_TYPEAHEAD,
+  //         comparison: '=',
+  //         placeholder: 'System ID of the device.'
+  //       },
+  //       {
+  //         key: 'place',
+  //         name: 'Event made in place',
+  //         typeahead: PLACE_TYPEAHEAD,
+  //         comparison: '=',
+  //         description: 'The name of the place where the event has been done'
+  //       }
+  //     ]),
+  //     defaultParams: {},
+  //     subResource: {
+  //       Device: {key: 'event_id', field: '_id'}
+  //     }
+  //   },
+  //   buttons: {
+  //     templateUrl: configFolder + '/resource-list-config-event'
+  //   },
+  //   table: {
+  //     th: [f.id.th, f.label.th, f['@type'].th, f.state.th, f.updated.thDef],
+  //     td: [f.id.td, f.label.td, f['@type'].td, f.state.td, f.updated.td]
+  //   }
+  // },
+  // Account: {
+  //   search: {
+  //     params: RESOURCE_SEARCH.params.concat([
+  //       {
+  //         key: 'email',
+  //         name: 'email',
+  //         typeahead: ACCOUNT_TYPEAHEAD,
+  //         comparison: '=',
+  //         description: 'Match account by their e-mail.'
+  //       },
+  //       {
+  //         key: 'organization',
+  //         name: 'Organization',
+  //         comparison: '=',
+  //         description: 'Match accounts by the organization they are in.'
+  //       }
+  //     ]),
+  //     defaultParams: {}
+  //   },
+  //   buttons: {
+  //     templateUrl: configFolder + '/resource-list-config-account'
+  //   },
+  //   table: {
+  //     th: [f.email.th, f.name.th, f.organization.th, f.updated.thDef],
+  //     td: [f.email.td, f.name.td, f.organization.td, f.updated.td]
+  //   }
+  // }
   }
 }
 
diff --git a/app/common/components/resource/resource-list/resource-list-config/resource-list-config-device.html b/app/common/components/resource/resource-list/resource-list-config/resource-list-config-device.html
deleted file mode 100644
index d42de162..00000000
--- a/app/common/components/resource/resource-list/resource-list-config/resource-list-config-device.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<resource-label-button resources="selector.total"></resource-label-button>
-<manual-events-button resources="selector.total"></manual-events-button>
-<!--<share devices="selector.total"></share>-->
-<certificate-button resources="selector.total"></certificate-button>
-<group-resource-button resources="selector.total"
-                       resource-type="{{resourceType}}"
-                       success="reload()"
-></group-resource-button>
-<resource-export resources="selector.total"></resource-export>
diff --git a/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.html b/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.html
index 879d5cd6..5fb59eea 100644
--- a/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.html
+++ b/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.html
@@ -1,4 +1,4 @@
-<span class="not-selectable">
+<!--<span class="not-selectable">
   {{totalResources}} items<span ng-show="selectedResources.length > 0">.</span>
 </span>
 <span ng-show="selectedResources.length > 0">
@@ -8,7 +8,7 @@
   >
   Selected {{selectedResources.length}} in total, {{numberSelectedResourcesInList}} in this list
   </span>
-</span>
+</span>-->
 
 
 
diff --git a/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.js b/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.js
index d0e30116..117dad48 100644
--- a/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.js
+++ b/app/common/components/resource/resource-list/resource-list-footer/resource-list-footer.directive.js
@@ -2,24 +2,22 @@
  * Number of resources in the list and similar information.
  *
  * undefined evaluates to true.
- * @param {ResourceListGetterBig} ResourceListGetterBig
- * @param {ResourceListSelectorBig} ResourceListSelectorBig
  */
-function resourceListFooter (ResourceListGetterBig, ResourceListSelectorBig) {
+function resourceListFooter () {
   return {
     template: require('./resource-list-footer.directive.html'),
     restrict: 'E',
-    scope: {},
-    link: $scope => {
-      $scope.UIB_TOOLTIP_TEMPLATE = require('./__init__').PATH + '/selected-resources.uib-tooltip-template.html'
-
-      ResourceListGetterBig.callbackOnGetting((__, ___, pag) => { $scope.totalResources = pag.totalPages })
-
-      ResourceListSelectorBig.callbackOnSelection((total, inList) => {
-        $scope.selectedResources = total
-        $scope.numberSelectedResourcesInList = inList.length
-      })
-    }
+    scope: {}
+    // link: $scope => {
+    //   $scope.UIB_TOOLTIP_TEMPLATE = require('./__init__').PATH + '/selected-resources.uib-tooltip-template.html'
+    //
+    //   ResourceListGetterBig.callbackOnGetting((__, ___, pag) => { $scope.totalResources = pag.totalResources })
+    //
+    //   ResourceListSelectorBig.callbackOnSelection((total, inList) => {
+    //     $scope.selectedResources = total
+    //     $scope.numberSelectedResourcesInList = inList.length
+    //   })
+    // }
   }
 }
 
diff --git a/app/common/components/resource/resource-list/resource-list-getter-big.factory.js b/app/common/components/resource/resource-list/resource-list-getter-big.factory.js
deleted file mode 100644
index b95a0c38..00000000
--- a/app/common/components/resource/resource-list/resource-list-getter-big.factory.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * @param {ResourceListGetter} ResourceListGetter
- * @returns {ResourceListGetterBig}
- * @constructor
- */
-function ResourceListGetterFactoryBig (ResourceListGetter) {
-  /**
-   * Note that this class has a Singleton instance.
-   */
-  let callbacksOnGetting = []
-  class ResourceListGetterBig extends ResourceListGetter {
-
-    getResources (getNextPage, showProgressBar) {
-      return super.getResources(getNextPage, showProgressBar).then(() => {
-        // Our superclass already has called the callbacks set by the non-static callbackOnGetting
-        // Now we call the callbacks set by the static callbackOnGetting
-        _.invokeMap(callbacksOnGetting, _.call, null, this.resources, this.resourceType, this.pagination, getNextPage)
-      })
-    }
-
-    static callbackOnGetting (callback) {
-      callbacksOnGetting.push(callback)
-    }
-  }
-
-  return ResourceListGetterBig
-}
-
-module.exports = ResourceListGetterFactoryBig
diff --git a/app/common/components/resource/resource-list/resource-list-getter.factory.js b/app/common/components/resource/resource-list/resource-list-getter.factory.js
index 78039b8e..328614f4 100644
--- a/app/common/components/resource/resource-list/resource-list-getter.factory.js
+++ b/app/common/components/resource/resource-list/resource-list-getter.factory.js
@@ -1,25 +1,26 @@
 function ResourceListGetterFactory (ResourceSettings) {
   const SEARCH = 'search'
   const utils = require('./../../utils.js')
-  const NoMorePagesAvailableException = require('./no-more-pages-available.exception')
 
   class ResourceListGetter {
     /**
      * Creates a resourceListGetter for a specific resourceType.
      *
      * Note: A limitation of resourceListGetter is that needs a default sort.
-     * @param {string} resourceType - The resource type where to get new resources.
+     * @param {string} resourceType - The resource type where to get new resources. //TODO Deprecated
      * @param {array} resources - An array of resource objects to update when new resources are got. This array is
      * updated by reference, so do not re-assign it.
      * @param {object} filterSettings - Configuration object for the filters.
      * @param {progressBar} progressBar - An instance of ngProgress.
+     * @param {defaultFilters} defaultFilters - Filters that will be applied to any request
      */
-    constructor (resourceType, resources, filterSettings, progressBar) {
+    constructor (resourceType, resources, filterSettings, progressBar, defaultFilters) {
       this.resourceType = resourceType
       this.resources = resources
       this.filterSettings = filterSettings
       this.server = ResourceSettings(resourceType).server
       this.progressBar = progressBar
+      this.defaultFilters = defaultFilters
       /**
        * A key/value object of filters, where every key represents a different source.
        * Clients can update their filter, and all of them are merged into
@@ -51,10 +52,12 @@ function ResourceListGetterFactory (ResourceSettings) {
       this.pagination = {
         morePagesAvailable: true,
         pagesAvailable: null,
-        totalPages: null,
+        totalResources: null,
         pageNumber: 1
       }
 
+      this.totalNumberResources = 0
+
       this._callbacksOnGetting = []
     }
 
@@ -67,9 +70,11 @@ function ResourceListGetterFactory (ResourceSettings) {
       this._filtersBySource[source] = newFilters
       // Let's merge the different filters in a single one
       this._filters = {}
-      _.merge.call(_, this._filters, ..._.values(this._filtersBySource))
+      _.merge(this._filters, ..._.values(this._filtersBySource))
       // The 'search' filters have preference over others
       _.merge(this._filters, this._filtersBySource[SEARCH])
+      // The default filters have preference over others
+      _.merge(this._filters, this.defaultFilters)
       // todo if this is called multiple times for the same parameters use isEqual and firstTime combo
       if (!_.isNull(this._filters) && !_.isNull(this._sort)) this.getResources()
     }
@@ -165,7 +170,9 @@ function ResourceListGetterFactory (ResourceSettings) {
      * @return {promise} The Restangular promise.
      */
     getResources (getNextPage = false, showProgressBar = true) {
-      if (getNextPage && !this.pagination.morePagesAvailable) throw new NoMorePagesAvailableException()
+      if (getNextPage && !this.pagination.morePagesAvailable) {
+        throw new Error('Tried to get more resources but there are no more pages available')
+      }
       if (showProgressBar) this.progressBar.start()
       // Only 'Load more' adds pages, so if not getNextPage equals a new search from page 1
       this.pagination.pageNumber = getNextPage ? this.pagination.pageNumber + 1 : 1
@@ -173,17 +180,129 @@ function ResourceListGetterFactory (ResourceSettings) {
         where: this._filters,
         page: this.pagination.pageNumber,
         sort: this._sort,
-        max_results: $(window).height() < 800 ? 20 : 30
+        max_results: this.resourceType === 'Device'
+          ? ($(window).height() < 800 ? 20 : 30)
+          : 15
       }
-      return this.server.getList(q).then(resources => {
-        if (showProgressBar) this.progressBar.complete()
-        if (!getNextPage) this.resources.length = 0
-        _.assign(this.resources, this.resources.concat(resources))
-        this.pagination.morePagesAvailable = resources._meta.page * resources._meta.max_results < resources._meta.total
-        this.pagination.totalPages = resources._meta.total
-        // broadcast to callbacks
-        _.invokeMap(this._callbacksOnGetting, _.call, null, this.resources, this.resourceType, this.pagination, getNextPage)
-      })
+
+      return this.server.getList(q).then(this._processResources.bind(this, getNextPage, showProgressBar))
+    }
+
+    _processResources (getNextPage, showProgressBar, resources) {
+      function convertScoreToScoreRange (newV) {
+        if (newV <= 2) {
+          return 'VeryLow'
+        } else if (newV <= 3) {
+          return 'Low'
+        } else if (newV <= 4) {
+          return 'Medium'
+        } else if (newV > 4) {
+          return 'High'
+        } else {
+          return '?'
+        }
+      }
+      if (showProgressBar) this.progressBar.complete()
+      if (!getNextPage) this.resources.length = 0
+      if (this.resourceType === 'Device') {
+        resources.forEach(r => {
+          const components = [ 'Motherboard', 'RamModule', 'SoundCard', 'GraphicCard', 'OpticalDrive', 'HardDrive', 'Processor', 'NetworkAdapter' ]
+          const isComponent = components.indexOf(r['@type']) !== -1
+          const isPlaceholder = r['@type'] === 'Device'
+
+          let parentLots = []
+
+          parentLots = parentLots.concat(r.ancestors)
+
+          // map different group types to 'Lot' and set label
+          parentLots = parentLots
+            .filter(r => {
+              // TODO add incoming/outgoing lot?
+              return r['@type'] === 'Lot' || r['@type'] === 'Package' || r['@type'] === 'Pallet'
+            }).map(l => {
+              // Workaround to set labels of selected lots provisionally. Necessary because API /devices doesn't include the 'label' property for device ancestors
+              // TODO remove as soon as API returns ancestor lots with labels set
+              // Get ancestors with /lots?where="{ id: [....] }"
+              l.label = l._id + ' (Deleted)'
+              l['@type'] = 'Lot'
+              return l
+            })
+
+          if (parentLots.length === 0) {
+            parentLots.push({
+              _id: 'NoParent',
+              '@type': 'Lot',
+              label: 'Without lot'
+            })
+          }
+
+          let title
+          if (isPlaceholder) {
+            title = 'Placeholder'
+          } else {
+            if (isComponent) {
+              _.assign(r, {
+                '@type': 'Component',
+                type: r['@type']
+              })
+            }
+            const manufacturer = r.manufacturer ? (' ' + r.manufacturer) : ''
+            const model = r.model ? (' ' + r.model) : ''
+            title = r.type + manufacturer + model
+          }
+
+          _.assign(r, {
+            status: (r.events && r.events.length > 0 && r.events[0]['@type'].substring('devices:'.length)) || 'Registered',
+            title: title,
+            donor: 'BCN Ayuntamiento', // TODO get from events
+            owner: 'Solidança', // TODO get from events
+            distributor: 'Donalo', // TODO get from events
+            parentLots: parentLots
+          })
+
+          let pathToScoreRange = 'condition.general.range'
+          let pathToScore = 'condition.general.score'
+          _.set(r, pathToScoreRange, convertScoreToScoreRange(_.get(r, pathToScore)))
+        })
+
+        let lots = {}
+        resources.forEach((device) => {
+          device.parentLots.forEach((lot) => {
+            lots[lot._id] = lots[lot._id] || []
+            lots[lot._id].push(lot)
+          })
+        })
+        let lotIDs = Object.keys(lots)
+
+        ResourceSettings('Lot').server.getList({
+          where: {'_id': { '$in': lotIDs }}
+        }).then((lotsWithLabel) => {
+          // add labels to lots
+          lotsWithLabel.forEach(lot => {
+            lots[lot._id].forEach(origLot => {
+              origLot.label = lot.label
+            })
+          })
+          this._updateResourcesAfterGet(getNextPage, resources)
+        })
+      } else {
+        this._updateResourcesAfterGet(getNextPage, resources)
+      }
+
+      return resources
+    }
+
+    _updateResourcesAfterGet (getNextPage, resources) {
+      _.assign(this.resources, this.resources.concat(resources))
+      this.totalNumberResources = (resources._meta && resources._meta.total) || 0 // TODO sometimes total number is not returned
+      this.pagination.morePagesAvailable = resources._meta && resources._meta.page * resources._meta.max_results < resources._meta.total
+      this.pagination.totalResources = resources._meta && resources._meta.total
+      // broadcast to callbacks
+      _.invokeMap(this._callbacksOnGetting, _.call, null, this.resources, this.lotID, this.resourceType, this.pagination, getNextPage)
+    }
+
+    getTotalNumberResources () {
+      return this.totalNumberResources || 0
     }
 
     /**
diff --git a/app/common/components/resource/resource-list/resource-list-selection-summary/components.html b/app/common/components/resource/resource-list/resource-list-selection-summary/components.html
new file mode 100644
index 00000000..a461b680
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selection-summary/components.html
@@ -0,0 +1,66 @@
+<div class="selection-details-content">
+  <button
+          type="button"
+          class="btn ng-scope btn-hide-details"
+          ng-click="selection.details[row.title] = false">
+    <i class="fa fa-chevron-left fa-fw"></i>
+  </button>
+  <h3>Components</h3>
+  <table class="table" id="device-dashboard-components">
+    <thead>
+    <tr>
+      <th></th>
+      <th></th>
+      <th></th>
+      <th>Range</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr ng-show="::selection.props.components.processorModel">
+      <td>
+        <resource-icon resource-type="Device" resource-subtype="Processor"></resource-icon>
+      </td>
+      <td>Processor</td>
+      <td>{{selection.props.components.processorModel}}</td>
+      <!--<td class="text-right">
+        <device-range score="resource.condition.components.processors"></device-range>
+      </td>-->
+    </tr>
+    <tr ng-show="::selection.props.components.totalHardDriveSize">
+      <td>
+        <resource-icon resource-type="Device" resource-subtype="HardDrive"></resource-icon>
+      </td>
+      <td>
+        Hard drive
+      </td>
+      <td>{{::selection.props.components.totalHardDriveSize}}</td>
+      <!--<td class="text-right">-->
+      <!--<device-range score="resource.condition.components.hardDrives"></device-range>-->
+      <!--</td>-->
+    </tr>
+    <tr ng-show="::selection.props.components.totalRamSize">
+      <td>
+        <resource-icon resource-type="Device" resource-subtype="RamModule"></resource-icon>
+      </td>
+      <td>
+        RAM
+      </td>
+      <td>{{::selection.props.components.totalRamSize}}</td>
+      <td class="text-right">
+        <device-range score="resource.condition.components.ram"></device-range>
+      </td>
+    </tr>
+    <!--<tr ng-show="::graphicCard">-->
+    <!--<td>-->
+    <!--<resource-icon resource-type="Device" resource-subtype="GraphicCard"></resource-icon>-->
+    <!--</td>-->
+    <!--<td>-->
+    <!--Graphics-->
+    <!--</td>-->
+    <!--<td>{{::graphicCard.model}} {{::graphicCard.manufacturer}}</td>-->
+    <!--<td>-->
+    <!--</td>-->
+    <!--</tr>-->
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/app/common/components/resource/resource-list/resource-list-selection-summary/condition-score.html b/app/common/components/resource/resource-list/resource-list-selection-summary/condition-score.html
new file mode 100644
index 00000000..8e7d914f
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selection-summary/condition-score.html
@@ -0,0 +1,55 @@
+<div class="selection-details-content">
+  <button
+          type="button"
+          class="btn ng-scope btn-hide-details"
+          ng-click="selection.details[row.title] = false">
+    <i class="fa fa-chevron-left fa-fw"></i>
+  </button>
+  <h3>Condition score</h3>
+  <table class="table" id="device-dashboard-condition">
+    <thead>
+    <tr>
+      <th></th>
+      <th></th>
+      <th></th>
+      <th>Condition</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr ng-show="::selection.props.condition.appearance.general">
+      <td>
+        <i class="fa fa-fw fa-eye"></i>
+      </td>
+      <td>Appearance</td>
+      <td>
+      </td>
+      <td class="text-right"
+          uib-tooltip="{{::appearance[selection.props.condition.appearance.general]}}">
+        <span class="label label-primary">{{::selection.props.condition.appearance.general}}</span>
+      </td>
+    </tr>
+    <tr ng-show="::selection.props.condition.functionality.general">
+      <td>
+        <i class="fa fa-fw fa-wrench"></i>
+      </td>
+      <td>Functionality</td>
+      <td>
+      </td>
+      <td class="text-right"
+          uib-tooltip="{{::functionality[selection.props.condition.functionality.general]}}">
+        <span class="label label-primary">{{::selection.props.condition.functionality.general}}</span>
+      </td>
+    </tr>
+    <tr class="active" ng-show="::selection.props.condition.general.range">
+      <td><i class="fa fa-fw fa-line-chart"></i></td>
+      <td>Total condition</td>
+      <td></td>
+      <td class="text-right">
+        <big>
+          <device-range score="selection.props.condition.general.range"></device-range>
+        </big>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/app/common/components/resource/resource-list/resource-list-selection-summary/events.html b/app/common/components/resource/resource-list/resource-list-selection-summary/events.html
new file mode 100644
index 00000000..fdc98198
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selection-summary/events.html
@@ -0,0 +1,63 @@
+<div ng-repeat="event in selection.props.events track by event._id"
+     class="selection-details-panel"
+     ng-class="{ active: selection.details[event._id] }"
+>
+  <div class="selection-details-content-wrapper">
+    <div class="selection-details-content-container">
+      <div class="selection-details-content">
+        <button
+                type="button"
+                class="btn btn-hide-details"
+                ng-click="selection.details[event._id] = false">
+          <i class="fa fa-chevron-left fa-fw"></i>
+        </button>
+        <div ng-switch="event['@type']">
+          <reserve-view resource="event" ng-switch-when="devices:Reserve"></reserve-view>
+          <sell-view resource="event" ng-switch-when="devices:Sell"></sell-view>
+          <div ng-switch-default>
+            <h3>{{ utils.getResourceTitle(event) }}</h3>
+            <button
+                    type="button"
+                    class="btn"
+                    ng-click="showDevicesOfEvent(event)">
+              View devices
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="selection-details-content">
+  <button
+          type="button"
+          class="btn btn-hide-details"
+          ng-click="selection.details[row.title] = false">
+    <i class="fa fa-chevron-left fa-fw"></i>
+  </button>
+  <h3>Events</h3>
+  <table class="resource-list-table table table-striped table-hover">
+    <thead>
+    <tr>
+      <th ng-repeat="th in config.tableEvents.th"
+          class="{{::th.cssClasses}}"
+      >
+        <strong>{{th.name}}</strong>
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+      <tr ng-repeat="event in selection.props.events" ng-click="selection.details[event._id] = true">
+        <td>
+          {{ event['@type'].substr('devices:'.length) }}
+        </td>
+        <td ng-repeat="prop in [ '_id', 'label', 'state' ]" class="hidden-xs">
+          {{ event[prop]}}
+        </td>
+        <td>
+          {{ event['_updated'] | date:'mediumDate' }}
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/app/common/components/resource/resource-list/resource-list-selection-summary/lots.html b/app/common/components/resource/resource-list/resource-list-selection-summary/lots.html
new file mode 100644
index 00000000..d96f84c8
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selection-summary/lots.html
@@ -0,0 +1,40 @@
+<div class="selection-details-content">
+  <button
+          type="button"
+          class="btn btn-hide-details"
+          ng-click="selection.details[row.title] = false">
+    <i class="fa fa-chevron-left fa-fw"></i>
+  </button>
+  <h3>Selected lots and devices</h3>
+  <ul class="selected-lots-list" ng-class="{ 'multi-selection': selection.multiSelection }">
+    <li
+            ng-repeat="lot in selection.props.lots track by lot._id"
+            class="pill-lot-container"
+    >
+      <div class="selected-lot"
+           ng-class="{ 'pill-lot': !selection.multiSelection, 'pill-lot-flex': !selection.multiSelection }">
+        <a ng-click="goTo(lot)">
+          <i class="fa fa-fw fa-lg fa-folder-o "></i>{{ lot.label }} ({{lot.selectedDevices.length}})
+        </a>
+        <button type="button"
+                class="btn"
+                ng-show="selection.multiSelection"
+                ng-click="deselectAll(lot.selectedDevices)"
+        >
+          <span>Deselect</span>
+        </button>
+      </div>
+      <ul class="selected-devices-in-lot row" ng-show="selection.multiSelection">
+        <li
+          ng-repeat="device in lot.selectedDevices track by device._id"
+          class="device col-lg-5"
+        >
+          <span>
+            <i class="fa fa-fw fa-lg fa-desktop"></i>
+            {{ device.title }}
+          </span>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
diff --git a/app/common/components/resource/resource-list/resource-list-selection-summary/price.html b/app/common/components/resource/resource-list/resource-list-selection-summary/price.html
new file mode 100644
index 00000000..1bde9252
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selection-summary/price.html
@@ -0,0 +1,48 @@
+<div class="selection-details-content">
+  <button
+          type="button"
+          class="btn ng-scope btn-hide-details"
+          ng-click="selection.details[row.title] = false">
+    <i class="fa fa-chevron-left fa-fw"></i>
+  </button>
+  <h3>Price</h3>
+  <div class="text-center">
+    <div class="btn-group btn-group-sm">
+      <h4 class="text-left">Warranty</h4>
+      <label class="btn btn-primary" ng-model="currencyOptions.val" uib-btn-radio="'standard'">
+        Standard
+      </label>
+      <!--<label class="btn btn-primary"-->
+             <!--ng-disabled="::!selector.getAggregatedPropertyOfSelected(allSelectedDevices, 'pricing.refurbisher.warranty2')"-->
+             <!--uib-tooltip="No 2 year warranty option for this device."-->
+             <!--tooltip-enable="::!selector.getAggregatedPropertyOfSelected(allSelectedDevices, 'pricing.refurbisher.warranty2')"-->
+             <!--ng-model="currencyOptions.val"-->
+             <!--uib-btn-radio="'warranty2'"-->
+      <!--&gt;-->
+        <!--2 year warranty-->
+      <!--</label>-->
+    </div>
+  </div>
+  <table class="table">
+    <thead>
+    <tr>
+      <th></th>
+      <th>%</th>
+      <th>Amount</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr ng-repeat="roleName in currencyOptions.roles">
+      <td>{{::roleName | humanize}}</td>
+      <td>{{ selection.props.pricing[roleName][currencyOptions.val].percentage }}</td>
+      <td>{{ selection.props.pricing[roleName][currencyOptions.val].amount }}</td>
+    </tr>
+    <tr class="active">
+      <td>Total</td>
+      <td></td>
+      <td>{{selection.props.pricing.total[currencyOptions.val] }}
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/app/common/components/resource/resource-list/resource-list-selection-summary/status.html b/app/common/components/resource/resource-list/resource-list-selection-summary/status.html
new file mode 100644
index 00000000..759ddb80
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selection-summary/status.html
@@ -0,0 +1,17 @@
+<div class="selection-details-content">
+  <button
+          type="button"
+          class="btn ng-scope btn-hide-details"
+          ng-click="selection.details[row.title] = false">
+    <i class="fa fa-chevron-left fa-fw"></i>
+  </button>
+  <h3>Status</h3>
+  <div class="row">
+    <div class="col-lg-6">
+      <div class="descriptor">
+        <h5>Current status</h5>
+        <h4>{{ selection.props.status }}</h4>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/common/components/resource/resource-list/resource-list-selection-summary/type.html b/app/common/components/resource/resource-list/resource-list-selection-summary/type.html
new file mode 100644
index 00000000..a708d818
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selection-summary/type.html
@@ -0,0 +1,39 @@
+<div class="selection-details-content">
+  <button
+          type="button"
+          class="btn ng-scope btn-hide-details"
+          ng-click="selection.details[row.title] = false">
+    <i class="fa fa-chevron-left fa-fw"></i>
+  </button>
+  <h3>Device</h3>
+  <div class="row">
+    <div class="col-xs-6">
+      <h5>Type</h5>
+      <h4>{{ selection.props.type }}</h4>
+    </div>
+    <div class="col-xs-6">
+      <h5>Sub type</h5>
+      <h4>{{ selection.props.subType }}</h4>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-xs-6">
+      <h5>Manufacturer</h5>
+      <h4>{{ selection.props.manufacturer }}</h4>
+    </div>
+    <div class="col-xs-6">
+      <h5>Model</h5>
+      <h4>{{ selection.props.model }}</h4>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-xs-6">
+      <h5>Serial number</h5>
+      <h4>{{ selection.props.serialNumber }}</h4>
+    </div>
+    <div class="col-xs-6">
+      <h5>HID</h5>
+      <h4>{{ selection.props.hid }}</h4>
+    </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/app/common/components/resource/resource-list/resource-list-selector-big.factory.js b/app/common/components/resource/resource-list/resource-list-selector-big.factory.js
deleted file mode 100644
index bd34a449..00000000
--- a/app/common/components/resource/resource-list/resource-list-selector-big.factory.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- * @param {ResourceListSelector} ResourceSelector
- * @returns {ResourceSelectorBig}
- * @constructor
- */
-function ResourceListSelectorBigFactory (ResourceListSelector) {
-  let callbacksForSelections = []
-  /**
-   * ResourceListSelector with a way to broadcast
-   */
-  class ResourceListSelectorBig extends ResourceListSelector {
-
-    _control () {
-      super._control()
-      // Perform callback
-      _.invokeMap(callbacksForSelections, _.call, null, this.total, this.inList, this.resources)
-    }
-
-    /**
-     * Callback to function after there have been changes in the selected resources.
-     *
-     * The callback method signature is: callback(totalSelectedResources, selectedResourcesInList, totalResources)
-     * @param {Function} callback
-     */
-    static callbackOnSelection (callback) {
-      callbacksForSelections.push(callback)
-    }
-  }
-
-  return ResourceListSelectorBig
-}
-
-module.exports = ResourceListSelectorBigFactory
diff --git a/app/common/components/resource/resource-list/resource-list-selector.factory.js b/app/common/components/resource/resource-list/resource-list-selector.factory.js
deleted file mode 100644
index 70f0dfb3..00000000
--- a/app/common/components/resource/resource-list/resource-list-selector.factory.js
+++ /dev/null
@@ -1,170 +0,0 @@
-function ResourceSelectorFactory () {
-  /**
-   * Manages selecting resources in the resource-list.
-   *
-   * The user can select them through a checkbox in every row and through a 'select all on this list' / 'unselect all'
-   * button at the end of the table.
-   *
-   * There is the concept of *actual list* and *total*. The actual list is formed by the list of resources the user
-   * sees. However, as the user filters the list, resources appear and disappear. Those resources that
-   * the user selected and disappeared are still being held in a *total* array, and if through the filters
-   * those resources appear again, the user will see them selected.
-   */
-  class ResourceListSelector {
-    /**
-     *
-     * @param {object} selector - A selector object with the ng-models of the checkboxes
-     *  - 'checked': the ng-model for the 'selectAll' checkbox
-     *  - 'checkboxes': an array of ng-models for the individual resource select checkboxes where the '_id' is the key.
-     * @param {array} resources - The array that will hold the resources
-     * @param {ResourceListGetter} resourceListGetter - An instance of ResourceListGetter
-     */
-    constructor (selector, resources, resourceListGetter) {
-      this.selector = selector
-      this.resources = resources
-
-      /**
-       * Array holding the resources that are selected in the actual list.
-       * @type {Array}
-       */
-      this.inList = selector.inList = []
-      /**
-       * Resources selected through all lists.
-       * @type {Array}
-       */
-      this.total = selector.total = []
-      resourceListGetter.callbackOnGetting(_.bind(this.reAddToActualList, this, _))
-      this.callbacksForSelections = []
-    }
-
-    /**
-     * Toggles the checkbox where the resource is in, selecting (or deselecting) the device(s)
-     * accordingly. It can be multiple devices if *shift* is pressed.
-     *
-     * @param {object} resource - The resource to select/deselect
-     * @param {$event} $event - JQuery's/JQLite event object
-     * @param {number} $index - The index of the resource in the *resources* list.
-     */
-    toggle (resource, $event, $index) {
-      if (this.isInList(resource)) { // Remove
-        this.remove(resource)
-      } else { // Add
-        if ($event.shiftKey) { // Add multiple
-          let foundPreviousSelectedOne = false
-          // Selects all resources until finds a previously selected resources or reaches the beginning
-          for (let i = $index; i >= 0 && !foundPreviousSelectedOne; i--) {
-            foundPreviousSelectedOne = !this.add(this.resources[i])
-          }
-        } else {  // Add one
-          this.add(resource)
-        }
-      }
-    }
-
-    /**
-     * Toggles the checkbox that lets selecting all resources on the list or unselect all resources, in general.
-     * @param selectAll
-     */
-    toggleSelectAll (selectAll) {
-      let self = this
-      if (selectAll) {
-        _.forEach(this.resources, resource => { self.add(resource) })  // Note that add can return false
-      }
-      else {
-        this.deselectAll()
-      }
-    }
-
-    /**
-     * Deselects all devices
-     */
-    deselectAll () {
-      this.inList.length = 0
-      this.total.length = 0
-      this.selector.checkboxes = {}
-      this._control()
-    }
-
-    /**
-     * Re-populate the actual list of resources with the passed-in resources.
-     *
-     * This method is used after getting new resources, as some resources may have been
-     * selected in other lists (they are in the total list).
-     * @param resources
-     */
-    reAddToActualList (resources) {
-      // We re-populate inList from the actual resources that are in total
-      let self = this
-      this.inList.length = 0
-      this._control()
-      this.selector.checkboxes = {} // todo is ok with ng-model?
-      _.forEach(resources, function (resource) {
-        if (_.find(self.total, {_id: resource._id})) {
-          self.add(resource, true) // 2nd parameter -> We add it only to inList
-        }
-      })
-    }
-
-    /**
-     * Returns true if the resource is in the *actual* list.
-     * @param {object} resource
-     * @returns {boolean}
-     */
-    isInList (resource) {
-      return _.find(this.inList, {_id: resource._id})
-    }
-
-    /**
-     * Adds a resource to the actual list and to the total, if it was not there before.
-     * @param {object} resource - The resource to add
-     * @param {boolean} inListOnly - True for not adding it to the total list
-     * @return {boolean} True if a *new* resource has been added to the list
-     */
-    add (resource, inListOnly = false) {
-      if (!this.isInList(resource)) {
-        this.inList.push(resource)
-        if (!inListOnly) {
-          this.total.push(resource)
-        } else {
-          // Although we don't add the resource to the total list, if the result existed in the total list, we update it
-          const indexOfExistingResource = _.findIndex(this.total, {'_id': resource._id})
-          if (indexOfExistingResource !== -1) this.total[indexOfExistingResource] = resource
-        }
-        this.selector.checkboxes[resource['_id']] = true
-        this._control()
-        return true
-      } else {
-        return false
-      }
-    }
-
-    /**
-     * Removes a resources from the actual and total lists, if it was there.
-     * @param resource
-     */
-    remove (resource) {
-      _.remove(this.inList, {'_id': resource['_id']})
-      _.remove(this.total, {'_id': resource['_id']})
-      this.selector.checkboxes[resource['_id']] = false
-      this._control()
-    }
-
-    /**
-     * Performs common tasks after adding/removing resources on both lists.
-     * @private
-     */
-    _control () {
-      this.selector.checked = this.inList.length === this.resources.length
-      _.invokeMap(this.callbacksForSelections, _.call, null, this.total, this.inList, this.resources)
-    }
-
-    callbackOnSelection (callback) {
-      this.callbacksForSelections.push(callback)
-    }
-
-  }
-
-  return ResourceListSelector
-}
-
-module.exports = ResourceSelectorFactory
diff --git a/app/common/components/resource/resource-list/resource-list-selector.service.js b/app/common/components/resource/resource-list/resource-list-selector.service.js
new file mode 100644
index 00000000..252f7c5d
--- /dev/null
+++ b/app/common/components/resource/resource-list/resource-list-selector.service.js
@@ -0,0 +1,286 @@
+/**
+ * Manages selecting resources in the resource-list.
+ *
+ * The user can select them through a checkbox in every row and through a 'select all on this list' / 'unselect all'
+ * button at the end of the table.
+ *
+ * There is the concept of *actual list* and *total*. The actual list is formed by the list of resources the user
+ * sees. However, as the user filters the list, resources appear and disappear. Those resources that
+ * the user selected and disappeared are still being held in a *total* array, and if through the filters
+ * those resources appear again, the user will see them selected.
+ */
+class ResourceListSelector {
+  /**
+   *
+   * @param {object} selector - A selector object with the ng-models of the checkboxes
+   *  - 'checked': the ng-model for the 'selectAll' checkbox
+   *  - 'checkboxes': an array of ng-models for the individual resource select checkboxes where the '_id' is the key.
+   */
+  constructor () {
+    let callbacksForSelections = []
+    let lots = []
+
+    /**
+     * Toggles the selected state of given resource, selecting (or deselecting) the device(s)
+     * accordingly. It can be multiple devices if *shift* is pressed.
+     *
+     * @param {object} resource - The resource to select/deselect
+     */
+    this.toggle = (resource, parentLot) => {
+      if (this.isSelected(resource)) { // Remove
+        remove(resource)
+      } else { // Add
+        add(resource, parentLot)
+      }
+      _control()
+    }
+
+    /**
+     * Selects all given resources
+     * @param resources
+     */
+    this.selectAll = (resources, parentLot) => {
+      if (!parentLot) {
+        throw new Error('parentLot must be set')
+      }
+      _.forEach(resources, resource => {
+        add(resource, parentLot)
+      })
+      _control()
+    }
+
+    /**
+     * Deselects all given devices
+     */
+    this.deselectAll = devices => {
+      _deselectAll(devices)
+      _control()
+    }
+
+    let _deselectAll = devices => {
+      if (!devices || !devices.slice) {
+        lots.length = 0
+        return
+      }
+
+      devices = devices.slice() // given devices might the same array we remove devices from
+      devices.forEach(device => {
+        remove(device)
+      })
+    }
+
+    /**
+     * Re-populate the actual list of resources with the passed-in resources.
+     *
+     * This method is used after getting new resources, as some resources may have been
+     * selected in other lists (they are in the total list).
+     * @param resources
+     * TODO refactor to use lots
+     */
+    this.reAddToLot = (resources, lotID) => {
+      // We re-populate inList from the actual resources that are in total
+      this.getLotByID(lotID) && (this.getLotByID(lotID).length = 0)
+      _control()
+    }
+
+    /**
+     * Returns true if the resource is selected, i.e. is in one of the lots
+     * @param {object} resource
+     * @returns {boolean}
+     */
+    this.isSelected = resource => {
+      let lotsList = getLotsAsList()
+      for (let i = 0; i < lotsList.length; i++) {
+        let existingResource = _.find(getSelectedDevices(lotsList[i]), {_id: resource._id})
+        if (existingResource) {
+          return true
+        }
+      }
+      return false
+    }
+
+    /**
+     * Adds given resource to all parent lots of the resource, if it was not there before.
+     * @param {object} resource - The resource to add
+     * @param {object} parentLot - Parent lot of given resource
+     */
+    let add = (resource, parentLot) => {
+      if (resource['@type'] === 'Lot') {
+        throw new Error('tried to add lot to selection')
+      }
+      if (!parentLot || !parentLot._id) {
+        throw new Error('parentLot must be defined and have _id property set')
+      }
+
+      resource.parentLots.forEach(_lot => {
+        let lot = getOrCreateLot(_lot)
+
+        let existingResource = _.find(lot.selectedDevices, {_id: resource._id})
+        if (!existingResource) {
+          lot.selectedDevices.push({
+            _id: resource._id,
+            device: resource
+          })
+        }
+      })
+    }
+
+    /**
+     * Removes a resources from the actual and total lists, if it was there.
+     * @param resource
+     */
+    let remove = resource => {
+      resource.parentLots.forEach(lot => {
+        let selectedLot = this.getLotByID(lot._id)
+        if (selectedLot) {
+          _.remove(selectedLot.selectedDevices, {'_id': resource['_id']})
+          if (selectedLot.selectedDevices === 0) {
+            deleteLotByID(lot._id)
+          }
+        }
+      })
+    }
+
+    this.callbackOnSelection = callback => {
+      callbacksForSelections.push(callback)
+    }
+
+    this.getAllSelectedDevices = () => {
+      let devices = {}
+      getLotsAsList().forEach(lot => {
+        getSelectedDevices(lot).forEach(device => {
+          devices[device._id] = device.device
+        })
+      })
+      return _.values(devices)
+    }
+
+    let getNonEmptyLots = () => {
+      return getLotsAsList()
+        .map((_lot) => {
+          let selectedDevices = getSelectedDevices(_lot).map((device) => {
+            return device.device
+          })
+          let lot = {}
+          _.assign(lot, _lot.lot, { selectedDevices: selectedDevices })
+          return lot
+        }).filter((lot) => {
+          return lot.selectedDevices.length > 0
+        })
+    }
+
+    /**
+     * Returns non empty lots. Lots in which devices where selected have lower indexes
+     */
+    this.getLots = () => {
+      return getNonEmptyLots()
+    }
+
+    let getLotsAsList = () => {
+      return lots
+    }
+
+    this.getLotByID = lotID => {
+      return _.find(lots, {_id: lotID})
+    }
+
+    let deleteLotByID = lotID => {
+      _.remove(lots, { _id: lotID })
+    }
+
+    let getSelectedDevices = lot => {
+      return lot.selectedDevices
+    }
+
+    let getOrCreateLot = (_lot) => {
+      let lot = this.getLotByID(_lot._id)
+      if (!lot) {
+        lot = {
+          _id: _lot._id,
+          lot: _lot,
+          selectedDevices: [],
+          hasOriginallySelectedDevices: false
+        }
+        lots.push(lot)
+      }
+      return lot
+    }
+
+    // Workaround to set labels of selected lots correctly. Necessary because API /devices doesn't include the 'label' property for device ancestors
+    // TODO remove as soon as API returns ancestor lots with labels set
+    this.nameLot = (_lot) => {
+      let lot = getOrCreateLot(_lot)
+      if (_lot.label) {
+        lot.lot.label = _lot.label
+      }
+      return lot
+    }
+
+    // TODO move to resource-list.directive
+    this.VARIOUS = 'Various'
+
+    // TODO move to resource-list.directive
+    this.getAggregatedPropertyOfSelected = (selectedDevices = [], pathToProp, valueIfDifferent = this.VARIOUS, postfix) => {
+      if (selectedDevices.length === 0) {
+        return null
+      }
+      let reducedDevice = selectedDevices.reduce((accumulate, device) => {
+        let value = accumulate[pathToProp]
+        if (_.has(device, pathToProp) && value !== _.get(device, pathToProp)) {
+          value = valueIfDifferent
+          postfix = ''
+        }
+        let reducedValue = {}
+        _.set(reducedValue, pathToProp, value)
+        return reducedValue
+      })
+
+      let aggregatedValue = _.get(reducedDevice, pathToProp)
+
+      if (aggregatedValue && postfix) {
+        aggregatedValue += postfix
+      }
+      return aggregatedValue
+    }
+
+    // TODO move to resource-list.directive
+    this.getRangeOfPropertyOfSelected = (selectedDevices = [], pathToProp, filter = (a) => a) => {
+      let min = 0
+      let max = 0
+      selectedDevices.forEach(device => {
+        if (_.has(device, pathToProp) && !min || _.get(device, pathToProp) < min) {
+          min = _.get(device, pathToProp)
+        }
+        if (_.has(device, pathToProp) && _.get(device, pathToProp) > max) {
+          max = _.get(device, pathToProp)
+        }
+      })
+      if (min === max) {
+        return filter(min)
+      }
+      return filter(min) + ' - ' + filter(max)
+    }
+
+    // TODO move to resource-list.directive
+    this.getAggregatedSetOfSelected = (selectedDevices = [], pathToProp, valueIdProp) => {
+      let set = {}
+      selectedDevices.forEach(device => {
+        _.get(device, pathToProp, []).forEach(value => {
+          let id = value[valueIdProp]
+          set[id] = value
+        })
+      })
+      return _.values(set)
+    }
+
+    /**
+     * Performs common tasks after adding/removing resources on both lists.
+     * @private
+     */
+    let _control = () => {
+      _.invokeMap(callbacksForSelections, _.call, null, lots)
+    }
+  }
+}
+
+module.exports = ResourceListSelector
diff --git a/app/common/components/resource/resource-list/resource-list.directive.html b/app/common/components/resource/resource-list/resource-list.directive.html
index 3e4984ff..97dfe23c 100644
--- a/app/common/components/resource/resource-list/resource-list.directive.html
+++ b/app/common/components/resource/resource-list/resource-list.directive.html
@@ -1,51 +1,58 @@
-<!-- Resource Search -->
-<div class="row" ng-class="{'hidden-xs': subResource.resource}">
-  <resource-search class="col-md-10 col-xs-offset-0 col-md-offset-1 show subview-12 subview-offset-0"
-                   settings="config.search.params"
-                   on-params-changed="onSearchParamsChanged(params)"
-                   default-params="config.search.defaultParams"
-  ></resource-search>
-</div>
-
-<!-- Butttons -->
-<div id="buttons" class="row text-center" ng-class="{'hidden-xs': subResource.resource}">
-  <span style="margin-right: 10px; font-weight: bold;">{{selector.total.length}} items selected: </span>
-  <div id="screener"
-       uib-tooltip="Select some {{resourceName}} first."
-       tooltip-enable="selector.inList.length == 0"
-       ng-mouseenter="hoverScreener = true"
-       ng-mouseleave="hoverScreener = false"
-  >
-    <div ng-show="selector.inList.length == 0"></div>
-
-    <div ng-include="config.buttons.templateUrl + (session.hasExplicitPerms()? '' : '-shared') + '.html'"></div>
-  </div>
-</div>
-
 <!-- Listing -->
 <div class="row">
-  <div
-    ng-class="{
-      'col-xs-12': type !== 'big' || !subResource.resource,
-      'col-xs-2 col-sm-4 col-lg-5': type === 'big' && subResource.resource
-    }"
-    class="fill-height-bar"
-  >
+  <div class="current-lot fill-height-bar col-sm-6 col-xs-12">
+    <resource-breadcrumb></resource-breadcrumb>
+    <h4>Lots ({{ totalNumberOfLots }})</h4>
+    <div class="children-lots"
+    >
+      <ul>
+        <li
+                ng-repeat="lot in lots"
+        >
+          <button ng-click="goTo(lot)">
+            <i class="fa fa-fw fa-lg fa-folder-o "></i>{{ lot.label }}
+          </button>
+        </li>
+        <li ng-show="moreLotsAvailable">
+          <button ng-click="getMoreLots()">
+            Show more
+          </button>
+        </li>
+      </ul>
+    </div>
+
+    <h4 style="display: inline-block; margin-bottom: 20px;">Devices ({{ totalNumberOfDevices }}) </h4>
+    <button type="button"
+            class="btn btn-info"
+            style="display: inline-block; padding: 5px 10px; margin-left: 10px;"
+            ng-show="!selection.areAllDevicesOfCurrentLotSelected && (devices.length > 0)"
+            ng-click="selector.selectAll(devices, parentResource)"
+    >
+      <span>Select all</span>
+    </button>
+    <button type="button"
+            class="btn btn-info"
+            style="display: inline-block; padding: 5px 10px; margin-left: 10px;"
+            ng-show="selection.areAllDevicesOfCurrentLotSelected && (devices.length > 0)"
+            ng-click="deselectAll(devices)"
+    >
+      <span>Deselect all</span>
+    </button>
+    <!-- Resource Filters -->
+    <resource-search settings="config.search.params"
+                     on-params-changed="onSearchParamsChanged(params)"
+                     default-params="config.search.defaultParams"
+    ></resource-search>
+
     <div infinite-scroll="getMore()" infinite-scroll-distance='0.8' infinite-scroll-use-document-bottom="false"
-         infinite-scroll-parent infinite-scroll-disabled="getMoreIsBusy || !morePagesAvailable"
+         infinite-scroll-parent infinite-scroll-disabled="getMoreIsBusy || !moreDevicesAvailable"
          infinite-scroll-listen-for-event="list:filtered"
     >
-      <table id="resource-list-table" class="table table-striped table-hover">
+      <table id="resource-list-table" class="resource-list-table table table-striped table-hover">
         <thead>
           <tr>
-            <th ng-class="{'hidden-xs': subResource.resource}">
-              <input type="checkbox"
-                     class="resource-list-checkbox"
-                     ng-click="toggleSelectAll(selector.checked)"
-                     ng-model="selector.checked">
-
-            </th>
             <th ng-repeat="th in config.table.th"
+                class="{{::th.cssClasses}}"
                 field-sort sort="setSort(sort)" key="{{::th.key}}" name="{{::th.name}}" group="sort"
                 sort-by-default="th.default"
             ></th>
@@ -53,33 +60,13 @@
           </tr>
         </thead>
         <tbody>
-          <tr ng-repeat="resource in resources track by resource._id"
-              ng-class="{info: subResource.isOpened(resource._id)}"
-
-              ng-init="popover = popovers[resource._id]"
-
-              uib-popover-template="::popovers.templateUrl"
-              popover-enable="popovers.enable"
-              popover-title="{{::popover.title}}"
-              popover-is-open="popover.isOpen"
-              popover-trigger="click"
-              popover-append-to-body="true"
-              popover-placement="{{popoverPlacement}}"
-              popover-class="resource-button-popover"
-
-              ng-click="$evalAsync(subResource.toggle(resource))"
-              ng-dblclick="subResource.openFull(resource)"
+          <tr ng-repeat="resource in devices track by resource._id"
+              ng-class="{info: selector.isSelected(resource)}"
+              ng-click="toggleSelect(resource, $index, $event)"
           >
-            <td ng-class="{'hidden-xs': subResource.resource}">
-              <input class="resource-list-checkbox"
-                     type="checkbox"
-                     ng-click="toggleSelect(resource, $event, $index)"
-                     ng-model="selector.checkboxes[resource['_id']]"
-                     ng-class="{blink: hoverScreener && resource._id === resources[0]._id && inList.length == 0}"
-              >
-            </td>
             <!-- $evalasync from https://stackoverflow.com/a/31352712 -->
             <td ng-repeat="td in ::config.table.td"
+                class="{{::td.cssClasses}}"
                 ng-init="value = $root._.get(resource, td.value)"
             >
               <div ng-if="::td.templateUrl" ng-include="td.templateUrl"></div>
@@ -91,9 +78,12 @@
                 <span ng-if="::td.number">
                   {{::$root._.get(resource, td.value) | number}}
                 </span>
+                <span ng-if="::td.currency">
+                  {{::$root._.get(resource, td.value) | currency:'€ ' }}
+                </span>
                 <!-- For now only label can be changed from a resource without refreshing the list, and label field
                 falls in here -->
-                <span ng-if="::!td.humanize && !td.number">
+                <span ng-if="::!td.humanize && !td.number && !td.currency">
                   <!-- Let's show more characters if we have a lg screen -->
                   <span class="hidden-lg">
                     {{$root._.get(resource, td.value) | limitTo: (td.limitTo || 15)}}
@@ -107,32 +97,111 @@
               </div>
               <div ng-if="::value && $root._.isDate(value)">{{value | timeAgo}}</div>
             </td>
-            <td ng-click="$evalAsync(subResource.toggle(resource))"
-                ng-dblclick="subResource.openFull(resource)"
-                class="text-center"
-            >
-              <resource-icon resource-type="{{::resource['@type']}}"
-                             resource-subtype="{{::resource.type}}"
-              >
-              </resource-icon>
-            </td>
           </tr>
         </tbody>
       </table>
       <div class="text-center">
         <i
           ng-class="{
-                      'fa fa-circle-o-notch fa-spin fa-lg': getMoreIsBusy && morePagesAvailable,
-                      'fa fa-ellipsis-h fa-lg': !morePagesAvailable
+                      'fa fa-circle-o-notch fa-spin fa-lg': getMoreIsBusy && moreDevicesAvailable,
+                      'fa fa-ellipsis-h fa-lg': !moreDevicesAvailable
                     }
                    "
         ></i>
       </div>
     </div>
   </div>
-  <!-- SubResource in right-bar -->
-  <aside ng-if="type === 'big' && subResource.resource" class="col-xs-10 col-sm-8 col-lg-7" id="aside-subResource">
-    <resource-view resource="subResource.resource" type="medium"></resource-view>
+  <!-- Selection button-->
+  <div class="selection-button"
+       ng-click="selectionPanelHiddenXS = !selectionPanelHiddenXS"
+       ng-class="{ 'hidden': selection.devices.length === 0, 'visible-xs-block': selection.devices.length > 0 }">
+    <button ng-show="selectionPanelHiddenXS" class="btn-info btn-view-selected">View selected devices ({{selection.devices.length}})</button>
+    <button ng-show="!selectionPanelHiddenXS" class="btn-info btn-view-list">Back to device list</button>
+  </div>
+  <!-- Selection -->
+  <aside class="selection col-sm-6 fill-height-bar col-xs-12"
+         ng-class="{ 'hidden-xs': selectionPanelHiddenXS }">
+    <div ng-if="selection.devices.length === 0">
+      <h3>Select devices to view more details</h3>
+    </div>
+
+    <div ng-if="selection.devices.length > 0">
+      <h4>Current selection</h4>
+      <div class="selection-header">
+        <h3>{{selection.devices.length}} devices </h3>
+        <button type="button"
+                class="btn"
+                ng-click="deselectAll()"
+        >
+          <span>Deselect all</span>
+        </button>
+      </div>
+      <ul>
+        <li
+          ng-repeat="device in selection.devices | limitTo: selection.numSelectedLotsShown track by device._id"
+          class="pill-device pill-device-flex"
+        >
+          <div>
+            <i class="fa fa-fw fa-lg fa-desktop"></i>{{ device.title }}
+          </div>
+        </li>
+        <li
+          ng-show="selection.showDisplayMoreSelectedLotsButton"
+          class="pill-lot pill-lot-flex"
+        >
+          <button type="button"
+                  class="btn"
+                  ng-click="selection.showMoreSelectedLots()"
+          >
+            <span>Show more</span>
+          </button>
+        </li>
+      </ul>
+      <div style="position: relative; overflow-x: hidden;">
+        <ul class="selection-summary">
+          <li ng-repeat="row in selection.summary track by row.title">
+            <button type="button"
+                    class="btn"
+                    ng-click="selection.details[row.title] = true"
+            >
+              <span class="selection-summary-title">{{row.title}}</span>
+              <span class="selection-summary-content">{{row.contentSummary}}</span>
+              <i class="fa fa-chevron-right fa-fw"></i>
+            </button>
+          </li>
+        </ul>
+        <div ng-repeat="row in selection.summary track by row.title"
+             class="selection-details-panel"
+             ng-class="{ active: selection.details[row.title] }"
+        >
+          <div class="selection-details-content-wrapper">
+            <div class="selection-details-content-container">
+              <div ng-if="::row.templateUrl"
+                   ng-include="::row.templateUrl"
+                   ng-class="row.cssClass"
+                   style="position: relative">
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- Buttons -->
+      <div id="buttons" class="row">
+        <resource-label-button></resource-label-button>
+        <manual-events-button></manual-events-button>
+        <!--&lt;!&ndash;<share devices="selector.getAllSelectedDevices()"></share>&ndash;&gt;-->
+        <certificate-button></certificate-button>
+        <group-resource-button
+                success="reload()"
+                resource-type="Device"
+                get-resources="selector.getAllSelectedDevices()"
+                register-to-resources-update="selector.callbackOnSelection(callback)">
+        </group-resource-button>
+        <resource-export resources="selector.getAllSelectedDevices()"></resource-export>
+      </div>
+    </div> <!-- ./ selectDevices > 0 -->
+
   </aside>
 </div>
 
diff --git a/app/common/components/resource/resource-list/resource-list.directive.js b/app/common/components/resource/resource-list/resource-list.directive.js
index 0232c88c..3357af8a 100644
--- a/app/common/components/resource/resource-list/resource-list.directive.js
+++ b/app/common/components/resource/resource-list/resource-list.directive.js
@@ -10,203 +10,366 @@
  * @param {ResourceBreadcrumb} ResourceBreadcrumb
  * @param {Session} session
  */
-function resourceList (resourceListConfig, ResourceListGetter, ResourceListGetterBig, ResourceListSelector,
-                       ResourceListSelectorBig, ResourceSettings, progressBar, ResourceBreadcrumb, session) {
-  const utils = require('./../../utils.js')
-  const PARENT_PATH = require('./../__init__').PATH
-  const NoMorePagesAvailableException = require('./no-more-pages-available.exception')
+function resourceList (resourceListConfig, ResourceListGetter, ResourceListSelector, ResourceSettings, progressBar, ResourceBreadcrumb, session, UNIT_CODES, CONSTANTS, SearchService, $filter) {
+  const PATH = require('./__init__').PATH
+  const selectionSummaryTemplateFolder = PATH + '/resource-list-selection-summary'
   return {
     template: require('./resource-list.directive.html'),
     restrict: 'E',
     scope: {
       // The parent resource. If it does not have @type, then we are the list of the main inventory view.
-      parentResource: '=?',
-      resourceType: '@', // The type of resource this list is representing.
-      type: '@' // Type of resource-view this list is in: big, medium, small
+      parentResource: '=?'
     },
     link: {
       // Note that we load on 'pre' to initialize before our child (or inner) directives so they get real config values
       pre: ($scope, element) => {
+        $scope.utils = require('./../../utils.js')
         $scope.session = session
-        const resourceType = $scope.resourceType
-        $scope.resourceName = utils.Naming.resource(resourceType)
-        if (!resourceType) throw TypeError('resourceList needs a "resourceType" set, not ' + resourceType)
-        if (!$scope.type) throw TypeError('resourceLists needs a "type" to be "big"|"medium"|"small", not ' + $scope.type)
-        progressBar.start() // resourceListGetter.getResources will call this too, but doing it here we avoid delay
-        const config = _.cloneDeep(resourceListConfig.views[resourceType])
-        if (_.isUndefined(config)) throw ReferenceError(resourceType + ' has no config.')
-        $scope.resources = [] // Do never directly assign (r=[]) to 'resources' as modules depend of its reference
+        progressBar.start() // getterDevices.getResources will call this too, but doing it here we avoid delay
+        const config = _.cloneDeep(resourceListConfig)
+        $scope.devices = [] // Do never directly assign (r=[]) to 'devices' as modules depend of its reference
+        $scope.lots = []
+
+        $scope.selectionPanelHiddenXS = true
+
         /**
-         * Object to handle accessing sub resources.
-         * @prop {object} resource - The resource
+         * Gets into the resource; traverse one step into the resource hierarchy by opening the resource in the
+         * main window.
+         * @param {Object} lot - Minimum properties are @type and _id
          */
-        const subResource = $scope.subResource = {
-          resource: null, // The opened subResource
-          isOpened: resourceId => {
-            return resourceId === _.get(subResource.resource, '_id')
-          },
-          /**
-           * Open / close the right window.
-           * @param {Object} resource
-           */
-          toggle: resource => {
-            subResource.resource = subResource.isOpened(resource['_id']) ? null : resource
-            triggerCollapse()
-          },
-          /**
-           * Closes a resource if it was the opened one
-           * @param {string} resourceId
-           */
-          close: resourceId => {
-            if (_.get(subResource.resource, '_id') === resourceId) {
-              subResource.resource = null
-              triggerCollapse()
-            }
-          },
-          /**
-           * Gets into the resource; traverse one step into the resource hierarchy by opening the resource in the
-           * main window.
-           * @param {Object} resource - Minimum properties are @type and _id
-           */
-          openFull: resource => {
-            ResourceBreadcrumb.go(resource)
-          }
+        $scope.goTo = lot => {
+          ResourceBreadcrumb.go(lot)
         }
 
-        // Makes the table collapsible when window resizes
-        // Note this method is executed too in $scope.toggleDeviceView
-        const triggerCollapse = require('./collapse-table.js')($scope)
-        $(window).resize(triggerCollapse)
-
-        // Note that some values of $scope are sate inside the constructors of ResourceListGetter and ResourceListSelector
-        let resourceListGetter
-        let resourceListSelector
-        $scope.resources.length = 0
-        $scope.selector = { // resourceListSelector needs the following vars
-          checked: false, // ng-model for the 'selectAll' checkbox
-          checkboxes: {}, // ng-model for the checkboxes in the list. Only for representational purposes.
-          // The selected resources of the actual list. Although resourceListSelector uses its own
-          // list, it can optionally populate this one if passed for use to use in the template
-          inList: [],
-          // The same as inList but for the total of resources through all lists
-          total: []
-        }
-        if ($scope.type === 'big') {
-          resourceListGetter = new ResourceListGetterBig(resourceType, $scope.resources, config, progressBar)
-          resourceListSelector = new ResourceListSelectorBig($scope.selector, $scope.resources, resourceListGetter)
-        } else {
-          resourceListGetter = new ResourceListGetter(resourceType, $scope.resources, config, progressBar)
-          resourceListSelector = new ResourceListSelector($scope.selector, $scope.resources, resourceListGetter)
-        }
+        // Set up getters and selectors for devices
+        const defaultFilters = ($scope.parentResource && $scope.parentResource._id)
+          ? { 'dh$insideLot': $scope.parentResource._id } // TODO dh$insideLot returns devices that are in specified lot OR any sublot of specified lot
+          : null
+        const getterDevices = new ResourceListGetter('Device', $scope.devices, config, progressBar, _.cloneDeep(defaultFilters))
+        const selector = $scope.selector = ResourceListSelector
+        getterDevices.callbackOnGetting((resources, lotID) => {
+          selector.reAddToLot(resources, lotID)
+          $scope.totalNumberOfDevices = getterDevices.getTotalNumberResources()
+          $scope.moreDevicesAvailable = $scope.totalNumberOfDevices > $scope.devices.length
+        })
+
+        // Set up getters for lots
+        const getterLots = new ResourceListGetter('Lot', $scope.lots, config, progressBar, _.cloneDeep(defaultFilters))
+        getterLots.updateSort('label')
+        getterLots.callbackOnGetting(() => {
+          $scope.totalNumberOfLots = getterLots.getTotalNumberResources()
+          $scope.moreLotsAvailable = $scope.totalNumberOfLots > $scope.lots.length
+        })
 
-        // Search
-        const parentType = _.get($scope, 'parentResource.@type')
-        if (parentType) {
-          // If we are the subresource of a parent, we can only show the resources that are tied somehow with
-          // the parent, not all resources. We do this by setting a default parameter in search
-          // no need to _.clone this setting as we do not modify it
-          const path = 'search.subResource.' + resourceType
-          const defaultParam = utils.getSetting(resourceListConfig.views, ResourceSettings(parentType), path)
-          if (!defaultParam) throw TypeError(`${parentType} does not have default param for subResource ${resourceType}`)
-          config.search.defaultParams[defaultParam.key] = $scope.parentResource[defaultParam.field]
+        // Workaround: In root, parentResource is not set. This must be after initializing ResourceListGetter
+        // TODO Delete workaround as soon as API returns root with label and _id set
+        $scope.parentResource = $scope.parentResource || {
+          _id: 'NoParent',
+          '@type': 'Lot',
+          label: 'Without lot'
         }
 
         // Sorting
         $scope.sort = {}
-        $scope.setSort = _.bind(resourceListGetter.updateSort, resourceListGetter, _)
+        $scope.setSort = _.bind(getterDevices.updateSort, getterDevices, _)
 
         // Filtering
-        $scope.onSearchParamsChanged = _.bind(resourceListGetter.updateFiltersFromSearch, resourceListGetter, _)
+        $scope.onSearchParamsChanged = newFilters => {
+          getterDevices.updateFiltersFromSearch(newFilters)
+          getterLots.updateFiltersFromSearch({}) // TODO update lots on filter update?
+        }
 
         // Selecting
-        $scope.toggleSelectAll = _.bind(resourceListSelector.toggleSelectAll, resourceListSelector, _)
-        $scope.toggleSelect = _.bind(resourceListSelector.toggle, resourceListSelector, _)
-        $scope.toggleSelect = (resource, $event, $index) => {
-          resourceListSelector.toggle(resource, $event, $index)
-          // Avoids the ng-click from the row (<tr>) to trigger
-          $event.stopPropagation()
+        $scope.toggleSelect = (resource, $index, $event) => {
+          $event.stopPropagation() // Avoids the ng-click from the row (<tr>) to trigger
+
+          if ($event.shiftKey) {
+            let lastSelectedIndex = $scope.lastSelectedIndex || 0
+            let start = Math.min(lastSelectedIndex, $index)
+            let end = Math.max(lastSelectedIndex, $index)
+            let devicesToSelect = $scope.devices.slice(start, end + 1)
+            selector.selectAll(devicesToSelect, $scope.parentResource)
+          } else if ($event.ctrlKey) {
+            selector.toggle(resource, $scope.parentResource)
+          } else {
+            let isSelected = selector.isSelected(resource)
+            if (isSelected) {
+              if ($scope.selection.devices.length === 1) {
+                selector.toggle(resource, $scope.parentResource) // remove
+              } else {
+                selector.deselectAll()
+                selector.toggle(resource, $scope.parentResource) // add
+              }
+            } else {
+              selector.deselectAll()
+              selector.toggle(resource, $scope.parentResource)
+            }
+          }
+          $scope.lastSelectedIndex = $index
+        }
+
+        $scope.deselectAll = (devices) => {
+          $scope.selector.deselectAll(devices)
+          $scope.lastSelectedIndex = 0
+        }
+
+        // Workaround to set labels of selected lots correctly. Necessary because API /devices doesn't include the 'label' property for device ancestors
+        // TODO remove as soon as API returns ancestor lots with labels set
+        $scope.parentResource && selector.nameLot($scope.parentResource)
+
+        // components, price and condition score (Must be above updateSelection)
+        // const manufacturerSettings = ResourceSettings('Manufacturer')
+        const deviceSettings = ResourceSettings('Device')
+        $scope.currencyOptions = {
+          currency: CONSTANTS.currency,
+          val: 'standard',
+          roles: ['retailer', 'platform', 'refurbisher'],
+          filter: (amount) => {
+            return $filter('currency')(amount, CONSTANTS.currency)
+          }
+        }
+        $scope.hasExplicitPerms = session.hasExplicitPerms()
+        $scope.hardDriveSizeUnit = UNIT_CODES[deviceSettings.schema.totalHardDriveSize.unitCode]
+        $scope.ramSizeUnit = UNIT_CODES[deviceSettings.schema.totalRamSize.unitCode]
+        $scope.appearance = deviceSettings.schema.condition.schema.appearance.schema.general.allowed_description
+        $scope.functionality = deviceSettings.schema.condition.schema.functionality.schema.general.allowed_description
+        // const where = {parent: $scope.resource._id, '@type': {'$in': ['GraphicCard', 'Processor']}}
+        // deviceSettings.server.getList({where: where}).then(components => {
+        //   $scope.graphicCard = _.find(components, {'@type': 'GraphicCard'})
+        //   const cpu = _.find(components, {'@type': 'Processor'})
+        //   if (cpu) {
+        //     manufacturerSettings.server.findText(['label'], cpu.manufacturer.split(' ')[0], true, 1).then(manu => {
+        //       if (manu.length) {
+        //         $scope.processorManufacturer = manu[0]
+        //       }
+        //     })
+        //   }
+        // })
+
+        function updateSelection () {
+          $scope.selection = $scope.selection || {}
+
+          let selectedDevices = $scope.selection.devices = selector.getAllSelectedDevices().slice()
+          $scope.selection.multiSelection = $scope.selection.devices.length > 1
+          $scope.selection.lots = selector.getLots().slice()
+
+          // mark current lot
+          let currentLot = _.find($scope.selection.lots, { _id: $scope.parentResource._id })
+          if (currentLot) {
+            currentLot.current = true
+          }
+
+          // selected lots pills
+          $scope.selection.numSelectedLotsShown = 3 // TODO get from config
+          $scope.selection.showDisplayMoreSelectedLotsButton =
+            $scope.selection.devices.length > $scope.selection.numSelectedLotsShown
+          $scope.selection.showMoreSelectedLots = () => {
+            $scope.selection.details.Lots = true
+          }
+
+          // select/deselect button
+          $scope.selection.areAllDevicesOfCurrentLotSelected = _.difference(
+            $scope.devices,
+            selectedDevices,
+            (a, b) => {
+              return a._id === b._id
+            }
+          ).length === 0
+
+          // aggregated properties of selected devices
+          let props = {
+            type: selector.getAggregatedPropertyOfSelected(selectedDevices, '@type'),
+            subType: selector.getAggregatedPropertyOfSelected(selectedDevices, 'type'),
+            manufacturer: selector.getAggregatedPropertyOfSelected(selectedDevices, 'manufacturer'),
+            model: selector.getAggregatedPropertyOfSelected(selectedDevices, 'model'),
+            serialNumber: selector.getAggregatedPropertyOfSelected(selectedDevices, 'serialNumber', 'Various serial numbers'),
+            hid: selector.getAggregatedPropertyOfSelected(selectedDevices, 'hid', 'Various hids'),
+            status: selector.getAggregatedPropertyOfSelected(selectedDevices, 'status'),
+            condition: {
+              appearance: {
+                general: selector.getRangeOfPropertyOfSelected(selectedDevices, 'condition.appearance.general')
+              },
+              functionality: {
+                general: selector.getRangeOfPropertyOfSelected(selectedDevices, 'condition.functionality.general')
+              },
+              general: {
+                range: selector.getAggregatedPropertyOfSelected(selectedDevices, 'condition.general.range')
+              }
+            },
+            components: {
+              processorModel: selector.getAggregatedPropertyOfSelected(selectedDevices, 'processorModel'),
+              totalHardDriveSize: selector.getAggregatedPropertyOfSelected(selectedDevices, 'totalHardDriveSize', 'Various', ' GB HardDrive'),
+              totalRamSize: selector.getAggregatedPropertyOfSelected(selectedDevices, 'totalRamSize', 'Various', ' MB RAM')
+            },
+            events: selector.getAggregatedSetOfSelected(selectedDevices, 'events', '_id'),
+            lots: $scope.selection.lots
+          }
+          $scope.currencyOptions.roles.forEach((roleName) => {
+            let path = 'pricing.' + roleName + '.' + $scope.currencyOptions.val
+            _.set(props,
+              path + '.percentage',
+              selector.getRangeOfPropertyOfSelected(selectedDevices, path + '.percentage', (percentage) => {
+                return $filter('percentage')(percentage)
+              })
+            )
+            _.set(props,
+              path + '.amount',
+              selector.getRangeOfPropertyOfSelected(selectedDevices, path + '.amount', $scope.currencyOptions.filter)
+            )
+          })
+          let path = 'pricing.total.' + $scope.currencyOptions.val
+          _.set(props,
+            path,
+            selector.getRangeOfPropertyOfSelected(selectedDevices, path, $scope.currencyOptions.filter)
+          )
+          $scope.selection.props = props
+
+          // Used to determine which details pane (e.g. type, components, events, ...) to show
+          $scope.selection.details = {}
+
+          $scope.selection.summary = []
+          const manufacturer = props.manufacturer ? (' ' + props.manufacturer) : ''
+          const model = props.model ? (' ' + props.model) : ''
+          // Summary for selection
+          let typeContentSummary
+          if (props.type === selector.VARIOUS) {
+            typeContentSummary = 'Various types'
+          } else if (props.type === 'Device') {
+            typeContentSummary = 'Placeholder'
+          } else if (props.subType === selector.VARIOUS) {
+            typeContentSummary = props.type + ' Various subtypes'
+          } else if (props.manufacturer === selector.VARIOUS) {
+            typeContentSummary = props.subType + ' Various manufacturers'
+          } else if (props.model === selector.VARIOUS) {
+            typeContentSummary = props.subType + manufacturer + ' Various models'
+          } else {
+            typeContentSummary = props.subType + manufacturer + model
+          }
+          const componentsContentSummary = _.values(props.components).filter(c => !!c).join(' ')
+          $scope.selection.summary = $scope.selection.summary.concat([
+            {
+              title: 'Type, manufacturer & model',
+              contentSummary: typeContentSummary,
+              cssClass: 'type',
+              templateUrl: selectionSummaryTemplateFolder + '/type.html'
+            },
+            {
+              title: 'Status',
+              contentSummary: props.status,
+              cssClass: 'status',
+              templateUrl: selectionSummaryTemplateFolder + '/status.html'
+            },
+            {
+              title: 'Price',
+              contentSummary: props.pricing.total[$scope.currencyOptions.val],
+              cssClass: 'price',
+              templateUrl: selectionSummaryTemplateFolder + '/price.html'
+            },
+            {
+              title: 'Condition score',
+              contentSummary: props.condition.general.range,
+              cssClass: 'condition-score',
+              templateUrl: selectionSummaryTemplateFolder + '/condition-score.html'
+            }
+          ])
+          if (componentsContentSummary) {
+            $scope.selection.summary.push({
+              title: 'Components',
+              contentSummary: componentsContentSummary,
+              cssClass: 'components',
+              templateUrl: selectionSummaryTemplateFolder + '/components.html'
+            })
+          }
+          $scope.selection.summary = $scope.selection.summary.concat([
+            {
+              title: 'Events',
+              contentSummary: props.events.length + ' events',
+              cssClass: 'events',
+              templateUrl: selectionSummaryTemplateFolder + '/events.html'
+            },
+            {
+              title: 'Lots',
+              contentSummary: props.lots.length + ' lots',
+              cssClass: 'lots',
+              templateUrl: selectionSummaryTemplateFolder + '/lots.html'
+            }
+          ])
         }
+        selector.callbackOnSelection(updateSelection)
+        updateSelection()
 
         // Reloading
         // When a button succeeds in submitting info and the list needs to be reloaded in order to get the updates
         $scope.reload = () => {
-          resourceListGetter.getResources()
-          resourceListSelector.deselectAll()
+          getterDevices.getResources()
+          $scope.deselectAll()
+        }
+        // TODO need this?
+        function hardReload () {
+          $scope.deselectAll()
+          $scope.reload()
         }
 
-        // Pagination
+        // Pagination Devices
         // Let's avoid the user pressing multiple times the 'load more'
         $scope.getMoreIsBusy = false
-        $scope.morePagesAvailable = true
         let getMoreFirstTime = false
         $scope.getMore = () => {
           if (!$scope.getMoreIsBusy && getMoreFirstTime) {
             $scope.getMoreIsBusy = true
-            try {
-              resourceListGetter.getResources(true, false).finally(() => { $scope.getMoreIsBusy = false })
-            } catch (err) {
+            getterDevices.getResources(true, false).finally(() => {
               $scope.getMoreIsBusy = false
-              if (!(err instanceof NoMorePagesAvailableException)) throw err
-              $scope.morePagesAvailable = false
-            }
+            })
           }
           getMoreFirstTime = true
         }
+
+        // Pagination lots
+        // Let's avoid the user pressing multiple times the 'load more'
+        $scope.getMoreLotsIsBusy = false
+        $scope.getMoreLots = () => {
+          if (!$scope.getMoreLotsIsBusy) {
+            $scope.getMoreLotsIsBusy = true
+            getterLots.getResources(true, false).finally(() => {
+              $scope.getMoreLotsIsBusy = false
+            })
+          }
+        }
+
         // If we don't want to collision with tables of subResources we
         // need to do this when declaring the directive
+        // TODO need this?
         const $table = element.find('.fill-height-bar')
-        resourceListGetter.callbackOnGetting((_, __, ___, getNextPage) => {
+        getterDevices.callbackOnGetting((_, __, ___, ____, getNextPage) => {
           if (!getNextPage) {
             $table.scrollTop(0) // Scroll up to the table when loading from page 0 again
             $scope.morePagesAvailable = true // Reset
           }
         })
 
-        // Popover is set on the left or bottom depending screen size (xs)
-        const computePlacement = () => $(window).width() <= 768 ? 'bottom-left' : 'auto left'
-        $scope.popoverPlacement = computePlacement()
-        $(window).resize(() => {
-          const placement = computePlacement()
-          if (placement !== $scope.popoverPlacement) $scope.$evalAsync(() => { $scope.popoverPlacement = placement })
-        })
-
-        $scope.popovers = {enable: false}
-        if ($scope.type === 'medium') {
-          resourceListGetter.callbackOnGetting(resources => {
-            $scope.popovers.enable = true
-            $scope.popovers.templateUrl = PARENT_PATH + '/resource-button/resource-button.popover.directive.html'
-            _.forEach(resources, resource => {
-              $scope.popovers[resource._id] = {
-                isOpen: false,
-                title: utils.getResourceTitle(resource)
-              }
-              // Extra costly todo find better way
-              $scope.$watch(() => $scope.popovers[resource._id].isOpen, isOpen => {
-                if (isOpen === false) {
-                  $scope.subResource.close(resource._id)
-                } else if (isOpen === true) { // Let's close other popovers
-                  _.forEach(resources, _resource => {
-                    if (_resource._id !== resource._id) $scope.popovers[_resource._id].isOpen = false
-                  })
-                }
-              })
-            })
+        // Sets filter to show devices of given event
+        $scope.showDevicesOfEvent = (event) => {
+          ResourceBreadcrumb.goToRoot().then(() => {
+            let searchParam = {
+              key: 'event_id',
+              name: 'Has event',
+              // $$hashKey: 'object:7368',
+              description: 'Match only devices that have a specific event.',
+              placeholder: 'ID of event'
+            }
+            let value = event._id
+            SearchService.addSearchParameter(searchParam, value)
           })
         }
 
-        function hardReload () {
-          $scope.checked = false
-          resourceListSelector.deselectAll()
-          $scope.reload()
-        }
+        // TODO what does next line?
+        ResourceSettings('Device').types.forEach(type => { $scope.$on('submitted@' + type, hardReload) })
 
-        if ($scope.type === 'big') {
-          ResourceSettings(resourceType).types.forEach(type => { $scope.$on('submitted@' + type, hardReload) })
-          // We register ourselves for any event type, excluding Snapshot if the list is not about devices
-          let eventTypes = ResourceSettings('Event').subResourcesNames
-          if (resourceType !== 'Device') eventTypes = _.without(eventTypes, 'devices:Snapshot', 'devices:Register')
-          _.forEach(eventTypes, eventType => { $scope.$on('submitted@' + eventType, hardReload) })
-        }
+        // We register ourselves for any event type, excluding Snapshot if the list is not about devices
+        let eventTypes = ResourceSettings('Event').subResourcesNames
+        // TODO do we need next line? resourceType is always 'Device' for now
+        // if (resourceType !== 'Device') eventTypes = _.without(eventTypes, 'devices:Snapshot', 'devices:Register')
+        _.forEach(eventTypes, eventType => { $scope.$on('submitted@' + eventType, hardReload) })
 
         // As we touch config in the init, we add it to $scope at the end to avoid $watch triggering multiple times
         $scope.config = config
diff --git a/app/common/components/resource/resource-list/resource-list.directive.sass b/app/common/components/resource/resource-list/resource-list.directive.sass
index a5d14495..bb85e0cf 100644
--- a/app/common/components/resource/resource-list/resource-list.directive.sass
+++ b/app/common/components/resource/resource-list/resource-list.directive.sass
@@ -1,6 +1,49 @@
 @import '_resource-list.directive'
 
-resource-list
+.breadcrumb
+  padding: 6px 0
+  font-size: 22px
+  margin-bottom: 0
+  background-color: transparent
+  group-resource-button
+    float: right
+    margin-left: 10px
+    .btn-primary
+      color: #767676
+      background-color: #ffffff
+      border-color: #a8a8a8
+      padding: 6px
+      border-radius: 3px
+
+  resource-field-edit
+    form
+      display: inline-block
+      width: inherit
+    .buttons
+      margin-left: 10px
+      margin-right: 10px
+  li + li:before
+    padding: 0 5px 0 15px
+  resource-icon
+    font-size: 1em
+    line-height: inherit
+  a
+    color: grey
+    text-decoration: none
+    &:hover
+      text-decoration: none
+
+.resource-list
+  background-color: #f4f4f4
+  padding: 0
+  @media (min-width: $screen-sm-min)
+    padding: 15px
+
+  .current-lot
+    padding: 10px
+    @media (min-width: $screen-sm-min)
+      padding: 15px 30px 30px 30px
+
   #screener
     display: inline-block
     position: relative
@@ -15,6 +58,8 @@ resource-list
     max-width: 2em
 
   #buttons
+    margin-top: 30px
+    text-align: right
     .btn
       padding-top: 0.25em
       padding-bottom: 0.25em
@@ -25,57 +70,275 @@ resource-list
     outline-offset: -2px
 
   .fill-height-bar
-    height: calc(100vh - #{$navbar-height} - #{$breadcrumb-height} - #{$footerHeight} - #{$tabsHeight} - #{$optionsMenuHeight} - #{$searchHeight})
-    @media (max-width: $screen-xs-max)
-      height: calc(100vh - #{$navbar-height} - #{$breadcrumb-height} - #{$footerHeight} - #{$tabsHeight})
     overflow-y: auto
+    height: calc(100vh - #{$navbar-height})
+    @media (min-width: $screen-sm-min)
+      height: calc(100vh - #{$navbar-height} - #{$footerHeight} - #{$optionsMenuHeight})
 
-  #resource-list-table tr
-    *
-      &:first-child
-        white-space: nowrap
+  .resource-list-table
+    &.table-hover
+      tbody
+        tr
+          &:hover
+            background-color: #85bfcf
+            color: white
+    tr
+      *
+        &:first-child
+          white-space: nowrap
 
-      .resource-list-checkbox
-        zoom: 1.5
-        -moz-transform: scale(1.5)
+        .resource-list-checkbox
+          zoom: 1.5
+          -moz-transform: scale(1.5)
 
-    td
-      user-select: none
-      cursor: pointer
+      td
+        user-select: none
+        cursor: pointer
 
-    th
-      padding-top: 0 !important
-    .label
-      display: block
+      th
+        padding-top: 0 !important
+      .label
+        display: block
 
-  #aside-subResource
-    padding-left: 0
+.selection-button
+  z-index: 99
+  position: fixed
+  bottom: 0
+  padding: 5px 0 15px 0
+  width: 100%
+  background-color: #e5e5e5
+  button.btn-view-selected
+    margin-left: 30%
+  button.btn-view-list
+    margin-left: 40%
+
+.selection
+  position: absolute
+  top: 0
+  background-color: #ffffff
+  padding: 5px 10px
+  ul
+    padding: 0
+  @media (min-width: $screen-sm-min)
+    position: inherit
+    padding: 30px
     border-left: 2px solid $main-nav-bg
     box-shadow: -5px -3px 10px -7px #999
-    resource-view
-      .fill-height-bar // a subview with a search bar (ex. any resource-list)
-        // - 2 * (everything we had in .fill-height-bar above) but calc does not allow 2 * (parenthesis) so we get it by
-        // breadcrumb is represented by $line-height-computed - $breadcrumb-padding-vertical
-        // applying the distributive property
-        height: calc(100vh - #{$navbar-height} - #{$breadcrumb-height} - #{$footerHeight} - 2 * #{$optionsMenuHeight} - #{$tabsMenuHeight} - #{$tabsHeight} - 2 * #{$searchHeight} - #{$subresourceH3Height}) !important
-        overflow-y: auto
-        @media (max-width: $screen-xs-max)
-          height: calc(100vh - #{$navbar-height} - #{$breadcrumb-height} - #{$footerHeight} - #{$optionsMenuHeight} - #{$tabsMenuHeight} - 1 * #{$searchHeight} - #{$subresourceH3Height}) !important
-
-      .fill-height // A subview without a search bar nor options buttons (ex. dashboard)
-        // We use fill-height-bar as initial, as only listing have subresources
-        height: calc(100vh - #{$navbar-height} - #{$breadcrumb-height} - #{$footerHeight} - #{$tabsHeight} - #{$tabsMenuHeight}  - #{$searchHeight} - #{$subresourceH3Height}) !important
-        overflow-y: auto
-
-        @media (max-width: $screen-xs-max)
-          height: calc(100vh - #{$navbar-height} - #{$breadcrumb-height} - #{$footerHeight} - #{$tabsMenuHeight} - 1 * #{$tabsHeight} - #{$subresourceH3Height}) !important
-
-      header
-        background-color: $main-nav-bg
-        h3
-          margin-top: 0
-          margin-bottom: 0
-          padding-top: $line-height-computed / 4
-
-#device-dashboard-components td:last-child span
-  display: block
+  .selection-header
+    margin-bottom: 10px
+    h3
+      display: inline-block
+    button
+      background-color: white
+      border: 1px solid #cbcbcb
+      border-radius: 7px
+      padding: 7px
+      margin-left: 10px
+      margin-bottom: 5px
+      color: #333333
+
+.children-lots
+  ul
+    padding: 0
+    li
+      list-style: none
+      display: inline-flex
+      border-radius: 4px
+      padding: 5px
+      border: 1px solid
+      margin-bottom: 6px
+      background-color: white
+      &:not(:last-child)
+        margin-right: 6px
+      button
+        background: none
+        border: none
+
+
+.pill-lot
+  list-style: none
+  border-radius: 4px
+  padding: 5px
+  border: 1px solid #666666
+  margin-bottom: 6px
+  background-color: white
+  cursor: pointer
+  button
+    background-color: transparent
+    padding: 0
+    &.btn:hover, &.btn:focus, &.btn.focus
+      color: #333333
+  &:not(:last-child)
+    margin-right: 6px
+
+.pill-device-flex
+  display: inline-flex
+
+.pill-device
+  list-style: none
+  padding: 5px
+  margin-bottom: 6px
+  background-color: white
+  cursor: pointer
+  button
+    background-color: transparent
+    padding: 0
+    &.btn:hover, &.btn:focus, &.btn.focus
+      color: #333333
+  &:not(:last-child)
+    margin-right: 6px
+
+.pill-lot-flex
+  display: inline-flex
+
+.selection-summary
+  margin-bottom: 0
+  li
+    list-style: none
+    outline: none !important
+    &:first-child > button
+      border-top-left-radius: 5px
+      border-top-right-radius: 5px
+    &:last-child > button
+      border-bottom-left-radius: 5px
+      border-bottom-right-radius: 5px
+    &:not(:first-child) > button
+      border-top: none
+    button
+      background-color: white
+      color: #333333
+      box-shadow: none
+      border: 1px solid #bfbfbf
+
+      width: 100%
+      text-align: left
+      &.btn:hover, &.btn:focus, &.btn.focus, &.btn:active
+        box-shadow: none
+        outline: none
+        background-color: #449bb4
+        border-color: white
+        color: white
+        .fa
+          display: block
+          color: white
+      .selection-summary-title
+        display: block
+      .selection-summary-content
+        font-size: 18px
+      .fa
+        float: right
+        font-size: 22px
+        display: none
+
+
+
+.selection-details-panel
+  border: 1px solid #bfbfbf
+  border-radius: 5px
+  position: absolute
+  top: 0
+  width: 100%
+  height: 100%
+  background-color: white
+  left: 100%
+  transition: all 700ms
+  //overflow-x: hidden
+  //overflow-y: scroll
+  &.active
+    left: 0
+  .selection-details-content-wrapper
+    position: relative
+    padding: 0
+    width: 100%
+    height: 100%
+    .selection-details-content-container
+      position: absolute
+      top: 0
+      width: 100%
+      height: 100%
+      padding: 0
+      overflow-x: hidden
+      .components > .table
+        max-width: 650px
+      .condition-score
+        td:last-child span
+          display: block
+      .lots
+        .selected-lots-list
+          padding-top: 20px
+          &.multi-selection
+            .pill-lot-container
+              background-color: #e8e8e8
+              border-radius: 7px
+              &:not(:last-child)
+                margin-bottom: 20px
+              .selected-lot
+                padding-bottom: 10px
+                margin-bottom: 12px
+                border-bottom: 1px #a6a6a6 solid
+                @media (min-width: $screen-sm-min)
+                  width: 75%
+          .pill-lot-container
+            list-style: none
+            padding: 8px
+            .selected-lot
+              a
+                color: #333333
+                &:hover
+                  color: #333333
+              button
+                background-color: white
+                margin-left: 10px
+                border-color: grey
+                padding: 7px
+                &:hover
+                  color: #333333
+            .selected-devices-in-lot
+              .device
+                list-style: none
+                display:
+                padding: 5px
+                &:not(:last-child)
+                  margin-right: 6px
+      .type
+        .descriptor
+          margin-bottom: 30px
+      .status-selector
+        display: -webkit-box
+        display: -webkit-flex
+        display: -ms-flexbox
+        display: flex
+        flex-wrap: wrap
+        margin-top: 20px
+        .btn
+          height: 100%
+          text-align: center
+          align-items: center
+          display: -webkit-box
+          display: -webkit-flex
+          display: -ms-flexbox
+          display: flex
+          justify-content: center
+          background-color: #ffffff
+          border-radius: 5px
+          border: 1px solid grey
+          h4
+            font-size: 22px
+          &.btn:hover, &.btn:focus, &.btn.focus
+            color: #333333
+      .selection-details-content
+        padding: 15px
+        *
+          word-wrap: break-word
+        .btn-hide-details
+          float: left
+          padding: 4px 10px
+          margin-right: 5px
+          border-radius: 5px
+          color: #333333
+          &.btn:hover, &.btn:focus, &.btn.focus, &.btn:active
+            color: #333333
+
+
+
+
diff --git a/app/common/components/resource/resource-search/angular-advanced-searchbox-ereuse.js b/app/common/components/resource/resource-search/angular-advanced-searchbox-ereuse.js
index 1fbbe1a0..865c535e 100644
--- a/app/common/components/resource/resource-search/angular-advanced-searchbox-ereuse.js
+++ b/app/common/components/resource/resource-search/angular-advanced-searchbox-ereuse.js
@@ -12,7 +12,7 @@
 (function () {
 
   angular.module('angular-advanced-searchbox', [])
-  .directive('nitAdvancedSearchbox', function (ResourceSettings) {
+  .directive('nitAdvancedSearchbox', function (ResourceSettings, SearchService) {
     return {
       restrict: 'E',
       scope: {
@@ -90,6 +90,11 @@
             // TODO: hide used suggestion
           }
 
+          function parametersAdded(param, value) {
+            $scope.addSearchParam(param, value)
+          }
+          SearchService.callbackOnSearchUpdate(parametersAdded)
+
           $scope.typeaheadCanRemove = function (e) {
             return e.keyCode == 8 && e.target.value.length == 0
           }
diff --git a/app/common/components/resource/resource-search/index.js b/app/common/components/resource/resource-search/index.js
index 313bcea4..455d6af0 100644
--- a/app/common/components/resource/resource-search/index.js
+++ b/app/common/components/resource/resource-search/index.js
@@ -6,5 +6,6 @@ module.exports = angular.module('common.components.resource.resource-search',
     require('./../../../config').name,
     'angular-advanced-searchbox'
   ])
-.directive('resourceSearch', require('./resource-search.directive'))
+  .service('SearchService', require('./search.service'))
+  .directive('resourceSearch', require('./resource-search.directive'))
 .constant('RESOURCE_SEARCH', require('./resource-search.constant'))
diff --git a/app/common/components/resource/resource-search/resource-search.directive.js b/app/common/components/resource/resource-search/resource-search.directive.js
index ba3f8ac9..83791015 100644
--- a/app/common/components/resource/resource-search/resource-search.directive.js
+++ b/app/common/components/resource/resource-search/resource-search.directive.js
@@ -16,6 +16,8 @@ function resourceSearch (ResourceSettings) {
           $scope._settings = $scope.settings
         }
         $scope.params = _.clone($scope.defaultParams)
+
+        // trigger first resource load
         $scope.onParamsChanged({params: $scope.params})
 
         $scope.$watchCollection('params', function checkForChangeAndPropagate (params, oldParams) {
diff --git a/app/common/components/resource/resource-search/search.service.js b/app/common/components/resource/resource-search/search.service.js
new file mode 100644
index 00000000..fd13405e
--- /dev/null
+++ b/app/common/components/resource/resource-search/search.service.js
@@ -0,0 +1,15 @@
+class DeviceSearchService {
+  constructor () {
+    let callbacksForSearchUpdate = []
+
+    this.addSearchParameter = (parameter, value) => {
+      _.invokeMap(callbacksForSearchUpdate, _.call, null, parameter, value)
+    }
+
+    this.callbackOnSearchUpdate = callback => {
+      callbacksForSearchUpdate.push(callback)
+    }
+  }
+}
+
+module.exports = DeviceSearchService
diff --git a/app/common/components/resource/resource-settings.factory.js b/app/common/components/resource/resource-settings.factory.js
index fb4a718d..b95c039d 100644
--- a/app/common/components/resource/resource-settings.factory.js
+++ b/app/common/components/resource/resource-settings.factory.js
@@ -14,6 +14,7 @@
  */
 function resourceSettingsFactory (ResourceServer, schema, RESOURCE_CONFIG) {
   const utils = require('./../utils')
+
   /**
    * Similar to DeviceHub's ResourceSettings, it stores several information about a resource. It can do:
    * - Stores settings and schema
@@ -57,6 +58,7 @@ function resourceSettingsFactory (ResourceServer, schema, RESOURCE_CONFIG) {
         this.subResourcesNames = _.without(this.types, this.type)
         this.isALeaf = this.subResourcesNames.length === 0 || this.type === 'devices:EraseBasic' // todo so works redo
         // Get which is our root ancestor
+        // TODO do we need root ancestor / sub resource?
         if (this.settings._root) { // We avoid infinite recursive calls by not calling isSubResource if we are root
           this.rootAncestor = this
         } else {
@@ -117,6 +119,9 @@ function resourceSettingsFactory (ResourceServer, schema, RESOURCE_CONFIG) {
    * @private
    */
   function _ResourceSettingsFactory (type) {
+    if (type === undefined) {
+      throw new Error('cannot get resource settings for given type. type is undefined')
+    }
     if (!(type in resourceTypes)) resourceTypes[type] = new ResourceSettings(type)
     return resourceTypes[type]
   }
diff --git a/app/common/components/resource/resource-settings.factory.spec.js b/app/common/components/resource/resource-settings.factory.spec.js
index 0eeee227..a24bab45 100644
--- a/app/common/components/resource/resource-settings.factory.spec.js
+++ b/app/common/components/resource/resource-settings.factory.spec.js
@@ -1,4 +1,3 @@
-const test = require('./../../../../tests/unit')
 const mock = require('./../../../../tests/unit/mock')()
 
 describe('Test ResourceSettings', function () {
@@ -46,7 +45,7 @@ describe('Test ResourceSettings', function () {
     // This setting is defined in devices:Snapshot
     expect(rSettings.getSetting('doNotUse')).toContain('debug')
     // This setting is defined in Event
-    expect(rSettings.getSetting('subviews')).toEqual(test.RESOURCE_CONFIG.resources.Event.subviews)
+    // expect(rSettings.getSetting('subviews')).toEqual(test.RESOURCE_CONFIG.resources.Event.subviews)
     // This property doesn't exist
     expect(() => {
       rSettings.getSetting('foo-bar-setting')
diff --git a/app/common/components/resource/resource-view/resource-view.directive.html b/app/common/components/resource/resource-view/resource-view.directive.html
index 6fbc075b..6c1aaa15 100644
--- a/app/common/components/resource/resource-view/resource-view.directive.html
+++ b/app/common/components/resource/resource-view/resource-view.directive.html
@@ -1,25 +1,10 @@
 <article>
-  <header ng-if="type==='medium' && resource['@type']">
-    <h3 ng-show="view.title" class="display-inline">
-        <span ng-repeat="t in view.title">
-          <span ng-if="t.humanize">{{resource[t.key] | humanize}}</span>
-          <span ng-if="!t.humanize">{{resource[t.key]}}</span>
-        </span>
-      <small ng-repeat="s in view.subtitle">
-        <span ng-if="s.humanize">{{resource[s.key] | humanize}}</span>
-        <span ng-if="!s.humanize">{{resource[s.key]}}</span>
-      </small>
-      <small class="pull-right">
-        <resource-icon resource-type="{{resource['@type']}}" resource-subtype="{{resource.type}}"></resource-icon>
-      </small>
-    </h3>
-  </header>
-  <div id="resource-view-body"></div>
-  <div ng-if="type==='small'">
-    <div>&nbsp;</div><!-- Don't know why a margin-top doesn't work here -->
-    <button ng-if="type==='small'" class="btn btn-default btn-block" ng-click="goTo(resource)">
-      Open it
-      <i class="fa fa-folder-open"></i>
-    </button>
+  <div id="resource-view-body">
+    <resource-list parent-resource="resource"
+                   resource="resource"
+                   model="model"
+                   class="col-xs-12 resource-list"
+    >
+    </resource-list>
   </div>
 </article>
diff --git a/app/common/components/resource/resource-view/resource-view.directive.js b/app/common/components/resource/resource-view/resource-view.directive.js
index d0952dbb..03886dfd 100644
--- a/app/common/components/resource/resource-view/resource-view.directive.js
+++ b/app/common/components/resource/resource-view/resource-view.directive.js
@@ -1,10 +1,5 @@
-function resourceView (RecursionHelper, Subview, cerberusToView, RESOURCE_CONFIG, ResourceBreadcrumb, ResourceSettings,
-                       $compile) {
-  const utils = require('./../../utils')
-  const BIG = 'big'
-  const MED = 'medium'
-  const SM = 'small'
-  const TYPES = [BIG, MED, SM]
+// TODO Deprecated
+function resourceView () {
   /**
    *
    * Represents a resource. Selects the appropriate view to show the resource, depending of its type.
@@ -17,80 +12,6 @@ function resourceView (RecursionHelper, Subview, cerberusToView, RESOURCE_CONFIG
     scope: {
       resource: '=?',
       type: '@'
-    },
-    compile: element => {
-      return RecursionHelper.compile(element, ($scope, iElement) => {
-        let tabs  // We keep a reference of the tabs to be able to $destroy and replace them when changing resource
-        if (!_.includes(TYPES, $scope.type)) {
-          throw TypeError('ResourceView only accepts big, medium and small as types.')
-        }
-
-        $scope.setActive = tabToActivate => {
-          _.forOwn($scope.tabs, tab => { tab.isActive = false })
-          tabToActivate.isActive = true
-        }
-
-        $scope.$on('changeTab', () => $scope.setActive())
-
-        $scope.$watch('resource._id', (newResourceId, oldResourceId) => {
-          // We create the tabs with the subviews embedded
-          // Note that resourceView is re-used to hold different types of resources at different times
-          if (newResourceId !== oldResourceId) generateViewAndSubview()
-        })
-
-        $scope.goTo = resource => ResourceBreadcrumb.go(resource)
-
-        function generateViewAndSubview () {
-          if ($scope.type === SM) {
-            $scope.srefUiParams = {
-              resourceName: utils.Naming.resource($scope.resource['@type']),
-              id: $scope.resource._id
-            }
-            // todo integrate this 3 lines with Subview class
-            const rSettings = ResourceSettings($scope.resource['@type'])
-            let view = angular.element(Subview.view(rSettings.getSetting('subviewSmall')))
-            $compile(view)($scope)
-            if (!_.isEmpty($scope.resource)) $scope.model = cerberusToView.parse($scope.resource)
-            iElement.find('#resource-view-body').html(view)
-          } else {
-            // first at all ensure variables in $scope subviews will use are ready
-            if (!_.isEmpty($scope.resource)) $scope.model = cerberusToView.parse($scope.resource)
-            // Gets the info for the view
-            const resourceType = _.get($scope, 'resource.@type')
-            if (!_.isUndefined(resourceType)) $scope.view = Subview.getSetting(resourceType, 'view')
-            // Generates the subviews
-            $scope.tabs = {} // Stores for each tab if it is the active one
-            $scope.tabs.active = 0  // Let's make the first tab the active one initially
-            // We need to manually destory the tabs and their children because we are replacing them through
-            // jquery (.html() function) and not through an angular way
-            if (tabs) tabs.isolateScope().$destroy()
-            tabs = Subview.generate($scope, resourceType)
-            iElement.find('#resource-view-body').html(tabs)
-            // If small we use the resourceName
-
-            if ($scope.type === BIG) {
-              const subviewsConfig = resourceType
-                ? Subview.getSetting(resourceType, 'subviews')
-                : RESOURCE_CONFIG.inventory.subviews
-              const num = subviewsConfig.length
-              const AVOID_INPUTS = new Set(['text', 'textarea', 'number', 'email', 'month', 'password', 'tel', 'time',
-                'url', 'date', 'datetime-local', 'search']) // We want to e.has to be fast
-              /**
-               * Sets the subviews tabs by pressing a number from the keyboard.
-               */
-              const keyPress = e => {
-                if (!AVOID_INPUTS.has(e.target.type) && _.inRange(e.which, 49, 49 + num)) {  // 49 is the keyCode for '1'
-                  $scope.$evalAsync(() => { $scope.tabs.active = e.which - 49 })
-                }
-              }
-              $(document).keypress(keyPress)
-              $scope.$on('$destroy', () => $(document).off('keypress', null, keyPress))
-            }
-          }
-        }
-
-        generateViewAndSubview()
-      })
     }
   }
 }
diff --git a/app/common/components/resource/resource-view/subview.factory.js b/app/common/components/resource/resource-view/subview.factory.js
deleted file mode 100644
index ba66b61a..00000000
--- a/app/common/components/resource/resource-view/subview.factory.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *
- * @param {ResourceSettings} ResourceSettings
- * @param RESOURCE_CONFIG
- * @param {ResourceViewGenerator} ResourceViewGeneratorFactory
- * @returns {Subview}
- * @constructor
- */
-function SubviewFactory (ResourceViewGenerator, RESOURCE_CONFIG) {
-  class Subview extends ResourceViewGenerator {
-
-    /**
-     * Generates a subview
-     * @param resourceType
-     * @param $scope
-     * @returns {Array}
-     */
-    static generate ($scope, resourceType = null) {
-      let subviewsConfig = resourceType ? this.getSetting(resourceType, 'subviews') : RESOURCE_CONFIG.inventory.subviews
-      return this.compile(subviewsConfig, $scope)
-    }
-
-    static _template (subviewsConfig, $scope) {
-      let body = `<uib-tabset id="subviews" type="pills" justified="true" active="tabs.active">`
-      _.forEach(subviewsConfig, (option) => {
-        let uid = option.view + option.resourceType
-        $scope.tabs[uid] = {isActive: false}
-        let icon = option.fa
-          ? _.map(_.isArray(option.fa) ? option.fa : [option.fa], fa => `<i class="fa ${fa} fa-fw fa-lg"></i>`).join('')
-          : `<resource-icon resource-type="${option.resourceIcon}"></resource-icon>`
-        body += `
-          <uib-tab select="setActive(tabs['${uid}'])">
-            <uib-tab-heading>
-              ${icon}
-              <span class="visible-sm-inline visible-md-inline visible-lg-inline view-tab-text">${option.name}</span>
-            </uib-tab-heading>
-            <div ng-if="tabs['${uid}'].isActive" class="container-fluid">
-              <div class="row">${this.view(option)}</div>
-            </div>
-          </uib-tab>
-        `
-      })
-      return body + '</uib-tabset>'
-    }
-
-    static view (option) {
-      return `
-        <${option.view} resource-type="${option.resourceType}" 
-                        type="{{type}}" 
-                        parent-resource="resource"
-                        resource="resource"
-                        model="model"
-                        class="${option.class} col-xs-12"
-        >
-        </${option.view}>
-      `
-    }
-
-  }
-
-  return Subview
-}
-
-module.exports = SubviewFactory
diff --git a/app/common/components/resource/resource/resource.directive.html b/app/common/components/resource/resource/resource.directive.html
index 4c0a368d..c5ca7f2c 100644
--- a/app/common/components/resource/resource/resource.directive.html
+++ b/app/common/components/resource/resource/resource.directive.html
@@ -2,4 +2,5 @@
   We will only pass the resource after getting it from server (the ng-if)
   this is needed when entering directly to a view (viewing a resource by entering through its URL)
 -->
-<resource-view ng-if="resource.fromServer" resource="resource" type="{{type}}"></resource-view>
+<resource-view resource="resource" type="big"></resource-view>
+<!-- TODO Following original does not work <resource-view ng-if="resource.fromServer" resource="resource" type="{{type}}"></resource-view> -->
diff --git a/app/common/components/resource/resource/resource.directive.js b/app/common/components/resource/resource/resource.directive.js
index 692f58c1..aa08ec74 100644
--- a/app/common/components/resource/resource/resource.directive.js
+++ b/app/common/components/resource/resource/resource.directive.js
@@ -1,6 +1,7 @@
 /**
  * Loads and shows a resource
  */
+// eslint-disable-next-line no-unused-vars
 function resource (RecursionHelper, ResourceSettings) {
   return {
     template: require('./resource.directive.html'),
@@ -12,10 +13,29 @@ function resource (RecursionHelper, ResourceSettings) {
     compile: element => {
       return RecursionHelper.compile(element, $scope => {
         $scope.resource = $scope.resource || {}
+        // const fakeResource = {
+        //   '_updated': '2018-04-13T10:35:39',
+        //   '_created': '2018-04-12T18:29:30',
+        //   'label': 'BDR',
+        //   '@type': 'Lot',
+        //   'ancestors': [],
+        //   '_id': 'NCZ0iW0mC',
+        //   '_links': {
+        //     'self': {'href': 'db1/lots/n98tkSWa', 'title': 'Lot'},
+        //     'collection': {'href': 'db1/lots', 'title': 'lots'},
+        //     'parent': {'href': '/', 'title': 'home'}
+        //   },
+        //   'children': {'lots': ['aEduoh01']},
+        //   'perms': [{'account': '5acfa595a0961e1b7f28c456', 'perm': 'r'}],
+        //   'byUser': '5acfa56aa0961e1b7f28c34a',
+        //   'sharedWith': ['5acfa595a0961e1b7f28c456']
+        // }
+        // _.assign($scope.resource, fakeResource) // So the value it is already there
+
+        // TODO comment in when removing fake resource
         let rSettings = ResourceSettings($scope.resource['@type'])
-        $scope.isEvent = rSettings.isSubResource('Event')
         // Get the resource
-        if (rSettings.authorized) {
+        if (rSettings.authorized) { // TODO why authorized setting?
           rSettings.server.one($scope.resource._id).get().then(resource => {
             _.assign($scope.resource, resource) // So the value it is already there
           }).catch(error => {
diff --git a/app/common/styles/_variables.sass b/app/common/styles/_variables.sass
index 3a7ddc6a..39e496fe 100644
--- a/app/common/styles/_variables.sass
+++ b/app/common/styles/_variables.sass
@@ -7,6 +7,8 @@ $navbar-default-bg: $body-bg
 $main-nav-bg: #EFEFEF !default
 $icon-font-path: './fonts/'
 $navbar-height: 42px !default
+$navbar-padding-vertical: 10px !default
+$navbar-padding-horizontal: 10px !default
 $tabsHeight: $navbar-height !default
 
 $nav-pills-bg: lighten($main-nav-bg, 4) !default
diff --git a/app/common/styles/app.sass b/app/common/styles/app.sass
index 6d3a94bb..7d91d9fd 100644
--- a/app/common/styles/app.sass
+++ b/app/common/styles/app.sass
@@ -87,10 +87,6 @@ button[ng-click], a, small[ng-click]
 a.text-success:hover
   color: $brand-success
 
-.breadcrumb
-  margin-bottom: 0
-
-
 h3, .h3
   margin-top: $line-height-computed / 2
   margin-bottom: ($line-height-computed / 2)
diff --git a/app/common/styles/footer.sass b/app/common/styles/footer.sass
index 487dd092..3e936dc5 100644
--- a/app/common/styles/footer.sass
+++ b/app/common/styles/footer.sass
@@ -1,19 +1,21 @@
 @import './variables'
 #footer
-  padding-left: 1em
-  background: linear-gradient(to bottom, rgba(255, 255, 255, 0) 0%, rgba(235, 235, 235, 1) 80%)
-  position: fixed
-  bottom: 0
-  width: 100vw
-  padding-right: 144px
-  font-size: $footer-font-size
-  img[src*=ereuse]
-    height: 30px
-    vertical-align: initial !important
+  display: none
+  @media (min-width: $screen-sm-min)
+    padding-left: 1em
+    background: linear-gradient(to bottom, rgba(255, 255, 255, 0) 0%, rgba(235, 235, 235, 1) 80%)
     position: fixed
     bottom: 0
-    right: 0
-  #links > *:not(:last-child)
-    padding-right: 1em
-    border-right: 1px gray solid
-    margin-right: 1em
+    width: 100vw
+    padding-right: 144px
+    font-size: $footer-font-size
+    img[src*=ereuse]
+      height: 30px
+      vertical-align: initial !important
+      position: fixed
+      bottom: 0
+      right: 0
+    #links > *:not(:last-child)
+      padding-right: 1em
+      border-right: 1px gray solid
+      margin-right: 1em
diff --git a/app/views/inventory/inventory.controller.html b/app/views/inventory/inventory.controller.html
index 9f23b6a2..3cf7a50c 100644
--- a/app/views/inventory/inventory.controller.html
+++ b/app/views/inventory/inventory.controller.html
@@ -1,5 +1,4 @@
 <div ui-view id="main-inventory">
-  <resource-breadcrumb></resource-breadcrumb>
   <div>
     <!--<left-bar class="col-sm-2 col-lg-1"></left-bar>-->
 <!--    <aside class="col-xs-2 col-lg-1">