diff --git a/admin/views/settings/combinedequipment/combinedequipment.html b/admin/views/settings/combinedequipment/combinedequipment.html
index 54fc4a03..0ee6f58c 100644
--- a/admin/views/settings/combinedequipment/combinedequipment.html
+++ b/admin/views/settings/combinedequipment/combinedequipment.html
@@ -74,11 +74,11 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentCombinedEquipment.name}}{{'COMBINED_EQUIPMENT.N_S_EQUIPMENT' | translate}}
 										</div>
-										<div class="panel-body"
+										<div class="panel-body maxheight"
 											x-hjc-drop-target="true"
 											x-on-drop="pairEquipment(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
@@ -145,11 +145,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentCombinedEquipment.name}}{{'SETTING.N_S_METER' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairMeter(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 
diff --git a/admin/views/settings/costcenter/costcenter.html b/admin/views/settings/costcenter/costcenter.html
index afe4a119..096db72a 100644
--- a/admin/views/settings/costcenter/costcenter.html
+++ b/admin/views/settings/costcenter/costcenter.html
@@ -53,17 +53,18 @@
 
 										</div>
 										<div class="col-lg-4">
-											<div class="panel panel-primary" slim-scroll box-height="500px">
+											<div class="panel panel-primary">
 												<div class="panel-heading">
 													{{currentCostCenter.name}}{{'SETTING.N_S_TARIFF' | translate}}
 												</div>
-												<div class="panel-body maxheight"
+											<div class="panel-body maxheight"
 												x-hjc-drop-target="true"
 												x-on-drop="pairTariff(dragEl,dropEl)"
-												uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
+												uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
+
 												<div class="btn btn-primary btn-rounded btn-block"
-												ng-repeat="costcentertariff in costcentertariffs"
-												x-hjc-draggable="true"> {{costcentertariff.name}}</div>
+												    ng-repeat="costcentertariff in costcentertariffs"
+												    x-hjc-draggable="true"> {{costcentertariff.name}}</div>
 
 											</div>
 										</div>
diff --git a/admin/views/settings/equipment/equipment.html b/admin/views/settings/equipment/equipment.html
index 20533263..f2721558 100644
--- a/admin/views/settings/equipment/equipment.html
+++ b/admin/views/settings/equipment/equipment.html
@@ -59,14 +59,14 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentEquipment.name}}{{'SETTING.N_S_METER' | translate}}
 										</div>
-										<div class="panel-body"
-										x-hjc-drop-target="true"
-										x-on-drop="pairMeter(dragEl,dropEl)"
-										uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
+										<div class="panel-body maxheight"
+									        x-hjc-drop-target="true"
+										    x-on-drop="pairMeter(dragEl,dropEl)"
+										    uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
 
 										<div class="btn btn-rounded btn-block"
 										ng-class="colorMeterType(equipmentmeter.metertype)"
diff --git a/admin/views/settings/shopfloor/shopfloor.html b/admin/views/settings/shopfloor/shopfloor.html
index 708a9888..76e2dde0 100644
--- a/admin/views/settings/shopfloor/shopfloor.html
+++ b/admin/views/settings/shopfloor/shopfloor.html
@@ -73,11 +73,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SETTING.N_S_METER' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairMeter(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 
@@ -158,11 +159,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SHOPFLOOR.N_S_EQUIPMENT' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairEquipment(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -230,11 +232,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SETTING.N_S_POINT' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairPoint(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -317,11 +320,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SETTING.N_S_SENSOR' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairSensor(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
diff --git a/admin/views/settings/space/space.html b/admin/views/settings/space/space.html
index 2c0d4d27..0c645aaf 100644
--- a/admin/views/settings/space/space.html
+++ b/admin/views/settings/space/space.html
@@ -144,13 +144,14 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SETTING.N_S_METER' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairMeter(dragEl,dropEl)"
-											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}"">
+											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 
 											<div class="btn btn-rounded btn-block"
 												ng-class="colorMeterType(spacemeter.metertype)"
@@ -215,11 +216,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SPACE.N_S_EQUIPMENT' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairEquipment(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -271,11 +273,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SPACE.N_S_COMBINED_EQUIPMENT' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairCombinedEquipment(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -327,11 +330,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SETTING.N_S_POINT' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairPoint(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -399,11 +403,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SETTING.N_S_SENSOR' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairSensor(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -455,11 +460,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SPACE.N_S_TENANT' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairTenant(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -510,11 +516,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SPACE.N_S_STORE' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairStore(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
@@ -565,11 +572,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SPACE.N_S_SHOPFLOOR' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairShopfloor(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"
diff --git a/admin/views/settings/store/store.html b/admin/views/settings/store/store.html
index 8bbf6c07..8d0c3196 100644
--- a/admin/views/settings/store/store.html
+++ b/admin/views/settings/store/store.html
@@ -69,20 +69,20 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentStore.name}}{{'SETTING.N_S_METER' | translate}}
 										</div>
-										<div class="panel-body"
-										x-hjc-drop-target="true"
-										x-on-drop="pairMeter(dragEl,dropEl)"
-										uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
+										<div class="panel-body maxheight"
+										    x-hjc-drop-target="true"
+										    x-on-drop="pairMeter(dragEl,dropEl)"
+										    uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
 
-										<div class="btn btn-rounded btn-block"
-										ng-class="colorMeterType(storemeter.metertype)"
-										ng-repeat="storemeter in storemeters"
-										x-hjc-draggable="true"
-										title="{{storemeter.metertype}}">({{storemeter.energy_category.name}}){{storemeter.name}}</div>
+											<div class="btn btn-rounded btn-block"
+											    ng-class="colorMeterType(storemeter.metertype)"
+											    ng-repeat="storemeter in storemeters"
+											    x-hjc-draggable="true"
+											    title="{{storemeter.metertype}}">({{storemeter.energy_category.name}}){{storemeter.name}}</div>
 									</div>
 								</div>
 								<div class="panel panel-danger">
@@ -147,19 +147,19 @@
 										</div>
 									</div>
 									<div class="col-lg-4">
-										<div class="panel panel-primary" slim-scroll box-height="500px">
+										<div class="panel panel-primary">
 											<div class="panel-heading">
 												{{currentStore.name}}{{'SETTING.N_S_POINT' | translate}}
 											</div>
-											<div class="panel-body"
-											x-hjc-drop-target="true"
-											x-on-drop="pairPoint(dragEl,dropEl)"
-											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
-											<div class="btn btn-primary btn-rounded btn-block"
-											title="{{'COMMON.STORE' | translate}}:{{storepoint.data_source.name}}"
-											ng-repeat="storepoint in storepoints"
-											x-hjc-draggable="true"> {{storepoint.name}}
-										</div>
+											<div class="panel-body maxheight"
+											    x-hjc-drop-target="true"
+											    x-on-drop="pairPoint(dragEl,dropEl)"
+											    uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
+												
+												<div class="btn btn-primary btn-rounded btn-block"
+												    title="{{'COMMON.STORE' | translate}}:{{storepoint.data_source.name}}"
+												    ng-repeat="storepoint in storepoints"
+												    x-hjc-draggable="true"> {{storepoint.name}}</div>
 										</div>
 									</div>
 									<div class="panel panel-danger">
@@ -224,19 +224,20 @@
 										</div>
 									</div>
 									<div class="col-lg-4">
-										<div class="panel panel-primary" slim-scroll box-height="500px">
+										<div class="panel panel-primary">
 											<div class="panel-heading">
 												{{currentStore.name}}{{'SETTING.N_S_SENSOR' | translate}}
 											</div>
 											<div class="panel-body"
-											x-hjc-drop-target="true"
-											x-on-drop="pairSensor(dragEl,dropEl)"
-											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
-											<div class="btn btn-primary btn-rounded btn-block"
-											title="{{'COMMON.STORE' | translate}}:{{storesensor.data_source.name}}"
-											ng-repeat="storesensor in storesensors"
-											x-hjc-draggable="true"> {{storesensor.name}}
-										</div>
+											    x-hjc-drop-target="true"
+											    x-on-drop="pairSensor(dragEl,dropEl)"
+											    uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}" >
+												
+												<div class="btn btn-primary btn-rounded btn-block"
+												    title="{{'COMMON.STORE' | translate}}:{{storesensor.data_source.name}}"
+												    ng-repeat="storesensor in storesensors"
+												    x-hjc-draggable="true"> {{storesensor.name}}
+											</div>
 										</div>
 									</div>
 									<div class="panel panel-danger">
diff --git a/admin/views/settings/tenant/tenant.html b/admin/views/settings/tenant/tenant.html
index 9174f1f7..712425a3 100644
--- a/admin/views/settings/tenant/tenant.html
+++ b/admin/views/settings/tenant/tenant.html
@@ -95,17 +95,19 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentTenant.name}}{{'SETTING.N_S_METER' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairMeter(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 
 											<div class="btn btn-rounded btn-block"
 												ng-class="colorMeterType(tenantmeter.metertype)"
-												ng-repeat="tenantmeter in tenantmeters" x-hjc-draggable="true"
+												ng-repeat="tenantmeter in tenantmeters" 
+												x-hjc-draggable="true"
 												title="{{tenantmeter.metertype}}">
 												({{tenantmeter.energy_category.name}}){{tenantmeter.name}}</div>
 										</div>
@@ -179,13 +181,15 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentTenant.name}}{{'SETTING.N_S_POINT' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairPoint(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
+											
 											<div class="btn btn-primary btn-rounded btn-block"
 												title="{{'COMMON.TENANT' | translate}}:{{tenantpoint.data_source.name}}"
 												ng-repeat="tenantpoint in tenantpoints" x-hjc-draggable="true">
@@ -265,11 +269,12 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary" slim-scroll box-height="500px">
+									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{currentTenant.name}}{{'SETTING.N_S_SENSOR' | translate}}
 										</div>
-										<div class="panel-body" x-hjc-drop-target="true"
+										<div class="panel-body maxheight" 
+										    x-hjc-drop-target="true"
 											x-on-drop="pairSensor(dragEl,dropEl)"
 											uib-tooltip="{{'SETTING.DRAG_TO_UNBIND' | translate}}">
 											<div class="btn btn-primary btn-rounded btn-block"