diff --git a/admin/views/settings/shopfloor/shopfloor.html b/admin/views/settings/shopfloor/shopfloor.html
index b1243cde..708a9888 100644
--- a/admin/views/settings/shopfloor/shopfloor.html
+++ b/admin/views/settings/shopfloor/shopfloor.html
@@ -72,8 +72,8 @@
 										</div>
 									</div>
 								</div>
-								<div class="col-lg-3">
-									<div class="panel panel-primary">
+								<div class="col-lg-4">
+									<div class="panel panel-primary" slim-scroll box-height="500px">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SETTING.N_S_METER' | translate}}
 										</div>
@@ -99,14 +99,14 @@
 									</div>
 								</div>
 
-								<div class="col-lg-3">
+								<div class="col-lg-4">
 									<!-- according panel-->
 									<div class="panel panel-primary">
 										<div class="panel-heading">
 											{{'SETTING.METER' | translate}}
 										</div>
 										<div class="panel-body" uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}"
-											slim-scroll box-height="600px">
+											slim-scroll box-height="765px">
 											<div class="form-group no-margin">
 												<label>{{'SETTING.METER_TYPE' | translate}}</label>
 												<select ng-change="changeMeterType()" ng-model="currentMeterType"
@@ -157,8 +157,8 @@
 										</div>
 									</div>
 								</div>
-								<div class="col-lg-3">
-									<div class="panel panel-primary">
+								<div class="col-lg-4">
+									<div class="panel panel-primary" slim-scroll box-height="500px">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SHOPFLOOR.N_S_EQUIPMENT' | translate}}
 										</div>
@@ -183,13 +183,13 @@
 									</div>
 								</div>
 
-								<div class="col-lg-3">
+								<div class="col-lg-4">
 									<!-- according panel-->
 									<div class="panel panel-primary">
 										<div class="panel-heading"> {{'SHOPFLOOR.EQUIPMENT_LIST' | translate}}
 										</div>
 										<div class="panel-body" uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}"
-											slim-scroll box-height="600px">
+											slim-scroll box-height="765px">
 											<div class="source btn btn-info btn-rounded btn-block"
 												ng-repeat="equipment in equipments" x-hjc-draggable="true">
 												{{equipment.name}}
@@ -208,7 +208,7 @@
 										<div class="panel-heading">
 											{{'COMMON.SHOPFLOOR' | translate}}
 										</div>
-										<div class="panel-body" slim-scroll box-height="600px">
+										<div class="panel-body">
 											<form role="form">
 												<div class="form-group no-margin">
 													<label>{{'SHOPFLOOR.SELECT_SHOPFLOOR' | translate}}</label>
@@ -230,7 +230,7 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary">
+									<div class="panel panel-primary" slim-scroll box-height="500px">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SETTING.N_S_POINT' | translate}}
 										</div>
@@ -259,7 +259,7 @@
 										<div class="panel-heading">
 											{{'SETTING.POINT_LIST' | translate}}
 										</div>
-										<div class="panel-body" slim-scroll box-height="600px"
+										<div class="panel-body" slim-scroll box-height="765px"
 											uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}">
 											<form role="form">
 												<div class="form-group no-margin">
@@ -295,7 +295,7 @@
 										<div class="panel-heading">
 											{{'COMMON.SHOPFLOOR' | translate}}
 										</div>
-										<div class="panel-body" slim-scroll box-height="600px">
+										<div class="panel-body">
 											<form role="form">
 												<div class="form-group no-margin">
 													<label>{{'SHOPFLOOR.SELECT_SHOPFLOOR' | translate}}</label>
@@ -317,7 +317,7 @@
 									</div>
 								</div>
 								<div class="col-lg-4">
-									<div class="panel panel-primary">
+									<div class="panel panel-primary" slim-scroll box-height="500px">
 										<div class="panel-heading">
 											{{currentShopfloor.name}}{{'SETTING.N_S_SENSOR' | translate}}
 										</div>
@@ -346,7 +346,7 @@
 										<div class="panel-heading">
 											{{'SENSOR.SELECT_SENSOR' | translate}}
 										</div>
-										<div class="panel-body" slim-scroll box-height="600px"
+										<div class="panel-body" slim-scroll box-height="765px"
 											uib-tooltip="{{'SETTING.DRAG_TO_BIND' | translate}}">
 											<h5>{{'SETTING.SENSOR_LIST' | translate}}</h5>
 											<div class="source btn btn-info btn-rounded btn-block"