diff --git a/CHANGELOG.md b/CHANGELOG.md
index 05817ce5a51d876ab072eb4b76375389a2d84bdc..ad2ef0fc81d17a4576e0504221ff478f4b30f401 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,9 +17,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - changed Related Parameters to Operating Characteristic Curve in myems-web
 - changed MultiTrendChart in myems-web
 - updated demo tariffs in database
+- updated view models in myems-admin
 ### Fixed
 - fixed non-standard actions of microgrid in myems-api and myems-admin
-- 
+-
 ### Removed
 -
 
@@ -40,7 +41,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - fixed issue of aggregate_hourly_data_by_period in myems-api
 - fixed issues of on_delete actions in myems-api
 - fixed unused import issues in myems-api
-- 
+-
 ### Removed
 - Removed google map api from myems-admin
 
diff --git a/myems-admin/views/settings/category/category.model.html b/myems-admin/views/settings/category/category.model.html
index ea0611d34ccfd52199889485286b3ff84a5ae380..7309c15d47cd9f5dc13a29d43233889cb1c5fbe4 100644
--- a/myems-admin/views/settings/category/category.model.html
+++ b/myems-admin/views/settings/category/category.model.html
@@ -21,7 +21,6 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'SETTING.KGCE' | translate}}</label>
                 <div class="col-sm-9"><input ng-model="category.kgce" type="number" name="categorykgce" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_category.categorykgce.$invalid && form_category.categorykgce.$dirty">
@@ -30,7 +29,6 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'SETTING.KGCO2E' | translate}}</label>
                 <div class="col-sm-9"><input ng-model="category.kgco2e" type="number" name="categorykgco2e" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_category.categorykgco2e.$invalid && form_category.categorykgco2e.$dirty">
diff --git a/myems-admin/views/settings/combinedequipment/combinedequipment.model.html b/myems-admin/views/settings/combinedequipment/combinedequipment.model.html
index fc33224cb98a0bb890b1b511ff066df57166024f..15f5a74ea88fb533f14d3de87d7ce3796e1f579b 100644
--- a/myems-admin/views/settings/combinedequipment/combinedequipment.model.html
+++ b/myems-admin/views/settings/combinedequipment/combinedequipment.model.html
@@ -20,8 +20,6 @@
                     </div>
                 </div>
             </div>
-
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</label>
                 <div class="col-sm-9">
                     <div class="checkbox checkbox-success">
@@ -29,49 +27,44 @@
                         <label for="chk_combinedequipment_isoutputcounted">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</label>
                     </div>
                 </div>
-			    </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.COST_CENTER' | translate}}</label>
-              <div class="col-sm-9">
-                  <ui-select ng-model="combinedequipment.cost_center.id" theme="bootstrap" required>
-                      <ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
-                      <ui-select-choices repeat="costcenter.id as costcenter in costcenters | filter: $select.search">
-                          <div ng-bind-html="costcenter.name | highlight: $select.search"></div>
-                      </ui-select-choices>
-                  </ui-select>
-              </div>
-          </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.SVG' | translate}}</label>
-              <div class="col-sm-9">
-                 <textarea ng-model="combinedequipment.svg" rows="20" cols="50" name="combinedequipmentsvg" class="form-control" required=""></textarea>
-                 <div class="m-t-xs" ng-show="form_combinedequipment.combinedequipmentsvg.$invalid && form_combinedequipment.combinedequipmentsvg.$dirty">
-                     <small class="text-danger" ng-show="form_combinedequipment.combinedequipmentsvg.$error.required">{{'COMBINED_EQUIPMENT.INPUT_SVG' | translate}}</small>
-                 </div>
-              </div>
-          </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.CAMERA_URL' | translate}}</label>
-              <div class="col-sm-9">
-                   <textarea ng-model="combinedequipment.camera_url" rows="5" cols="50" name="combinedequipmentcameraurl" class="form-control"></textarea>
-              </div>
-          </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
-              <div class="col-sm-9"><input ng-model="combinedequipment.description" type="text" name="combinedequipmentdescription" class="form-control" >
-                  <div class="m-t-xs" ng-show="form_combinedequipment.combinedequipmentdescription.$invalid && form_combinedequipment.combinedequipmentdescription.$dirty">
-                      <small class="text-danger" ng-show="form_combinedequipment.combinedequipmentdescription.$error.required">{{'COMBINED_EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>
-                  </div>
-              </div>
-          </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'COMMON.QR_CODE' | translate}} </label>
-          <div class="col-sm-9">
-              <div>
-                   <qrcode data="{{combinedequipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
-              </div>
-          </div>
-        </div>
+			</div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.COST_CENTER' | translate}}</label>
+                <div class="col-sm-9">
+                    <ui-select ng-model="combinedequipment.cost_center.id" theme="bootstrap" required>
+                        <ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
+                        <ui-select-choices repeat="costcenter.id as costcenter in costcenters | filter: $select.search">
+                            <div ng-bind-html="costcenter.name | highlight: $select.search"></div>
+                        </ui-select-choices>
+                    </ui-select>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.SVG' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+                <div class="col-sm-9">
+                    <textarea ng-model="combinedequipment.svg" rows="20" cols="50" name="combinedequipmentsvg" class="form-control" required=""></textarea>
+                    <div class="m-t-xs" ng-show="form_combinedequipment.combinedequipmentsvg.$invalid && form_combinedequipment.combinedequipmentsvg.$dirty">
+                        <small class="text-danger" ng-show="form_combinedequipment.combinedequipmentsvg.$error.required">{{'COMBINED_EQUIPMENT.INPUT_SVG' | translate}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.CAMERA_URL' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+                <div class="col-sm-9">
+                    <textarea ng-model="combinedequipment.camera_url" rows="5" cols="50" name="combinedequipmentcameraurl" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+                <div class="col-sm-9"><input ng-model="combinedequipment.description" type="text" name="combinedequipmentdescription" class="form-control" >
+                    <div class="m-t-xs" ng-show="form_combinedequipment.combinedequipmentdescription.$invalid && form_combinedequipment.combinedequipmentdescription.$dirty">
+                        <small class="text-danger" ng-show="form_combinedequipment.combinedequipmentdescription.$error.required">{{'COMBINED_EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+                <div class="col-sm-9">
+                    <div>
+                        <qrcode data="{{combinedequipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/myems-admin/views/settings/contact/contact.model.html b/myems-admin/views/settings/contact/contact.model.html
index 235bd2cdb073e04cc11ad0c3cf11500e1bb8295d..9eb54812670de160cc5672d266f28fc0bdeceae3 100644
--- a/myems-admin/views/settings/contact/contact.model.html
+++ b/myems-admin/views/settings/contact/contact.model.html
@@ -5,7 +5,6 @@
     <div class="modal-body">
         <form role="form" name="form_contact" novalidate class="form-horizontal">
             <div class="form-group"><label class="col-sm-3 control-label">{{'SETTING.NAME' | translate}}</label>
-
                 <div class="col-sm-9"><input ng-model="contact.name" type="text" name="name" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_contact.name.$invalid && form_contact.name.$dirty">
                         <small class="text-danger" ng-show="form_contact.name.$error.required">{{'SETTING.INPUT_NAME' | translate}}</small>
@@ -14,7 +13,6 @@
             </div>
             <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'CONTACT.EMAIL' | translate}}</label>
-
                 <div class="col-sm-9"><input ng-model="contact.email" type="email" name="email" class="form-control" required="">
                 <div class="m-t-xs" ng-show="form_contact.email.$invalid && form_contact.email.$dirty">
                         <small class="text-danger" ng-show="form_contact.email.$error.required">{{'CONTACT.INPUT_EMAIL' | translate}}</small>
@@ -22,9 +20,7 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'CONTACT.PHONE' | translate}}</label>
-
                 <div class="col-sm-9"><input ng-model="contact.phone" type="tel" name="phone" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_contact.phone.$invalid && form_contact.phone.$dirty">
                         <small class="text-danger" ng-show="form_contact.phone.$error.required">{{'CONTACT.INPUT_PHONE' | translate}}</small>
@@ -32,9 +28,7 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
-
                 <div class="col-sm-9"><input ng-model="contact.description" type="text" name="contactdescription" class="form-control" >
                     <div class="m-t-xs" ng-show="form_contact.description.$invalid && form_contact.description.$dirty">
                         <small class="text-danger" ng-show="form_contact.description.$error.required">{{'CONTACT.INPUT_DESCRIPTION' | translate}}</small>
@@ -42,8 +36,6 @@
                     </div>
                 </div>
             </div>
-
-
         </form>
     </div>
     <div class="modal-footer">
diff --git a/myems-admin/views/settings/costcenter/costcenter.model.html b/myems-admin/views/settings/costcenter/costcenter.model.html
index 32fcab664ef36208d22dd6a128546d2ce71473b4..983df45b227e2101e68f301d8dc220fcd22051e0 100644
--- a/myems-admin/views/settings/costcenter/costcenter.model.html
+++ b/myems-admin/views/settings/costcenter/costcenter.model.html
@@ -13,7 +13,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-3 control-label">{{'COSTCENTER.EXTERNAL_ID' | translate}}</label>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'COSTCENTER.EXTERNAL_ID' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
 
                 <div class="col-sm-9"><input ng-model="costcenter.external_id" type="text" name="costcenterexternalid" class="form-control">
                 </div>
diff --git a/myems-admin/views/settings/datasource/datasource.model.html b/myems-admin/views/settings/datasource/datasource.model.html
index b7cd05d93840da0dff2b150f1cbb49d8fe261ef0..231ca297055557305331901c61f81a557761ae7b 100644
--- a/myems-admin/views/settings/datasource/datasource.model.html
+++ b/myems-admin/views/settings/datasource/datasource.model.html
@@ -5,14 +5,12 @@
     <div class="modal-body">
         <form role="form" name="form_datasource" novalidate class="form-horizontal">
             <div class="form-group"><label class="col-sm-2 control-label">{{'SETTING.NAME' | translate}}</label>
-
                 <div class="col-sm-10"><input ng-model="datasource.name" type="text" name="datasourcename" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_datasource.datasourcename.$invalid && form_datasource.datasourcename.$dirty">
                         <small class="text-danger" ng-show="form_datasource.datasourcename.$error.required">{{'SETTING.INPUT_NAME' | translate}}</small>
                     </div>
                 </div>
             </div>
-            
             <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'GATEWAY.GATEWAY' | translate}}</label>
                 <div class="col-sm-10">
@@ -27,30 +25,21 @@
                     </div>
                 </div>
             </div>
-
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DATA_SOURCE.PROTOCOL' | translate}}</label>
-
                 <div class="col-sm-10"><input ng-model="datasource.protocol" type="text" name="datasourceprotocol" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_datasource.datasourceprotocol.$invalid && form_datasource.datasourceprotocol.$dirty">
                         <small class="text-danger" ng-show="form_datasource.datasourceprotocol.$error.required">{{'DATA_SOURCE.INPUT_PROTOCOL' | translate}}</small>
                     </div>
                 </div>
             </div>
-            
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DATA_SOURCE.CONNECTION' | translate}}</label>
-
-                <div class="col-sm-10"><textarea ng-disabled="disable" uib-tooltip='Connection data in JSON. Modbus TCP Example: {"host":"10.111.212.88", "port":502}' rows="3" ng-model="datasource.connection" type="text" name="datasourceconnection" class="form-control" required=""></textarea>
+                <div class="col-sm-10"><textarea ng-disabled="disable" uib-tooltip='Connection data in JSON. Modbus TCP Example: {"host":"10.111.212.88", "port":502, "interval_in_seconds":60}' rows="3" ng-model="datasource.connection" type="text" name="datasourceconnection" class="form-control" required=""></textarea>
                     <div class="m-t-xs" ng-show="form_datasource.datasourceconnection.$invalid && form_datasource.datasourceconnection.$dirty">
                         <small class="text-danger" ng-show="form_datasource.datasourceconnection.$error.required">{{'DATA_SOURCE.INPUT_CONNECTION' | translate}}</small>
                     </div>
                 </div>
             </div>
-
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DATA_SOURCE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
-
                 <div class="col-sm-10"><input ng-model="datasource.description" type="text" name="datasourcedescription" class="form-control" >
                     <div class="m-t-xs" ng-show="form_datasource.datasourcedescription.$invalid && form_datasource.datasourceprotocol.$dirty">
                         <small class="text-danger" ng-show="form_datasource.datasourcdescription.$error.required">{{'DATA_SOURCE.INPUT_DESCRIPTION' | translate}}</small>
diff --git a/myems-admin/views/settings/distributionsystem/distributioncircuit.model.html b/myems-admin/views/settings/distributionsystem/distributioncircuit.model.html
index b23312616050f1b3f6a4b07aa64b5f4952fa59d9..66c634d881f448363f7f394a6d501971caec0003 100644
--- a/myems-admin/views/settings/distributionsystem/distributioncircuit.model.html
+++ b/myems-admin/views/settings/distributionsystem/distributioncircuit.model.html
@@ -20,7 +20,6 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT_SWITCHGEAR' | translate}}</label>
                 <div class="col-sm-10"><input ng-model="distributioncircuit.switchgear" type="text" name="distributioncircuitswitchgear" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_distributioncircuit.distributioncircuitswitchgear.$invalid && form_distributioncircuit.distributioncircuitswitchgear.$dirty">
@@ -28,7 +27,6 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT_PEAK_LOAD' | translate}}</label>
                 <div class="col-sm-10"><input ng-model="distributioncircuit.peak_load" type="number" name="distributioncircuitpeakload" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_distributioncircuit.distributioncircuitpeakload.$invalid && form_distributioncircuit.distributioncircuitpeakload.$dirty">
@@ -36,7 +34,6 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT_PEAK_CURRENT' | translate}}</label>
                 <div class="col-sm-10"><input ng-model="distributioncircuit.peak_current" type="number" name="distributioncircuitpeakcurrent" class="form-control" required="">
                     <div class="m-t-xs" ng-show="form_distributioncircuit.distributioncircuitpeakcurrent.$invalid && form_distributioncircuit.distributioncircuitpeakcurrent.$dirty">
@@ -44,12 +41,10 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT_CUSTOMERS' | translate}}</label>
                 <div class="col-sm-10"><input ng-model="distributioncircuit.customers" type="text" name="distributioncircuitcustomers" class="form-control">
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT_METERS' | translate}}</label>
                 <div class="col-sm-10"><input ng-model="distributioncircuit.meters" type="text" name="distributioncircuitmeters" class="form-control">
                 </div>
diff --git a/myems-admin/views/settings/distributionsystem/distributionsystem.model.html b/myems-admin/views/settings/distributionsystem/distributionsystem.model.html
index cb0d77def09463e14af07de5faa1b85209c07adb..30f2cdc98175eaee32a2d5d1e00b04e85df20c6c 100644
--- a/myems-admin/views/settings/distributionsystem/distributionsystem.model.html
+++ b/myems-admin/views/settings/distributionsystem/distributionsystem.model.html
@@ -19,7 +19,6 @@
                     </div>
                 </div>
             </div>
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-10"><input ng-model="distributionsystem.description" type="text" name="distributionsystemdescription" class="form-control" >
                 </div>
diff --git a/myems-admin/views/settings/equipment/equipment.model.html b/myems-admin/views/settings/equipment/equipment.model.html
index 482882aad8dce0492f71049e17fc69a2eb8cb57c..3eefbddd819c25ca1ee366b38aad6b100cfb91e4 100644
--- a/myems-admin/views/settings/equipment/equipment.model.html
+++ b/myems-admin/views/settings/equipment/equipment.model.html
@@ -20,8 +20,6 @@
                     </div>
                 </div>
             </div>
-
-            <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</label>
                 <div class="col-sm-9">
                     <div class="checkbox checkbox-success">
@@ -29,48 +27,44 @@
                         <label for="chk_equipment_isoutputcounted">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</label>
                     </div>
                 </div>
-			    </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.COST_CENTER' | translate}}</label>
-              <div class="col-sm-9">
-                  <ui-select ng-model="equipment.cost_center.id" theme="bootstrap" required>
-                      <ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
-                      <ui-select-choices repeat="costcenter.id as costcenter in costcenters | filter: $select.search">
-                          <div ng-bind-html="costcenter.name | highlight: $select.search"></div>
-                      </ui-select-choices>
-                  </ui-select>
-              </div>
-          </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.SVG' | translate}}</label>
-              <div class="col-sm-9">
-                 <textarea ng-model="equipment.svg" rows="20" cols="50" name="equipmentsvg" class="form-control" required=""></textarea>
-                 <div class="m-t-xs" ng-show="form_equipment.equipmentsvg.$invalid && form_equipment.equipmentsvg.$dirty">
-                     <small class="text-danger" ng-show="form_equipment.equipmentsvg.$error.required">{{'EQUIPMENT.INPUT_SVG' | translate}}</small>
-                 </div>
-              </div>
-          </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.CAMERA_URL' | translate}}</label>
-              <div class="col-sm-9">
-                 <textarea ng-model="equipment.camera_url" rows="5" cols="50" name="equipmentcameraurl" class="form-control"></textarea>
-              </div>
-          </div>
-          <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
-              <div class="col-sm-9"><input ng-model="equipment.description" type="text" name="equipmentdescription" class="form-control" >
-                  <div class="m-t-xs" ng-show="form_equipment.equipmentdescription.$invalid && form_equipment.equipmentdescription.$dirty">
-                      <small class="text-danger" ng-show="form_equipment.equipmentdescription.$error.required">{{'EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>
-                  </div>
-              </div>
-          </div>
-          <div class="form-group"><label class="col-sm-3 control-label">{{'COMMON.QR_CODE' | translate}} </label>
-              <div class="col-sm-9">
-                  <div>
-                       <qrcode data="{{equipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
-                  </div>
-              </div>
-          </div>
+			</div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.COST_CENTER' | translate}}</label>
+                <div class="col-sm-9">
+                    <ui-select ng-model="equipment.cost_center.id" theme="bootstrap" required>
+                        <ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
+                        <ui-select-choices repeat="costcenter.id as costcenter in costcenters | filter: $select.search">
+                            <div ng-bind-html="costcenter.name | highlight: $select.search"></div>
+                        </ui-select-choices>
+                    </ui-select>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.SVG' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+                <div class="col-sm-9">
+                    <textarea ng-model="equipment.svg" rows="20" cols="50" name="equipmentsvg" class="form-control" required=""></textarea>
+                    <div class="m-t-xs" ng-show="form_equipment.equipmentsvg.$invalid && form_equipment.equipmentsvg.$dirty">
+                        <small class="text-danger" ng-show="form_equipment.equipmentsvg.$error.required">{{'EQUIPMENT.INPUT_SVG' | translate}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.CAMERA_URL' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+                <div class="col-sm-9">
+                    <textarea ng-model="equipment.camera_url" rows="5" cols="50" name="equipmentcameraurl" class="form-control"></textarea>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+                <div class="col-sm-9"><input ng-model="equipment.description" type="text" name="equipmentdescription" class="form-control" >
+                    <div class="m-t-xs" ng-show="form_equipment.equipmentdescription.$invalid && form_equipment.equipmentdescription.$dirty">
+                        <small class="text-danger" ng-show="form_equipment.equipmentdescription.$error.required">{{'EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>
+                    </div>
+                </div>
+            </div>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+                <div class="col-sm-9">
+                    <div>
+                        <qrcode data="{{equipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/myems-admin/views/settings/space/space.model.html b/myems-admin/views/settings/space/space.model.html
index 3fdb1a8e3bc32d48918902058ea6ee5d55d3fd96..b052c48e1ffb5172c4cd874c2e406445965fa9e8 100644
--- a/myems-admin/views/settings/space/space.model.html
+++ b/myems-admin/views/settings/space/space.model.html
@@ -101,7 +101,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-4 control-label">{{'SPACE.GET_COORDINATE' | translate}}"</label>
+                <label class="col-sm-4 control-label">{{'SPACE.GET_COORDINATE' | translate}}</label>
                 <div class="col-sm-8">
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">百度地图</a>
                     <a class="btn btn-primary btn-rounded btn-outline" href="https://www.google.com/maps" target="_blank">Google Maps</a>
diff --git a/myems-modbus-tcp/README.md b/myems-modbus-tcp/README.md
index f3105a274cb1ea86dd4de53a68ac9e5a4e1af175..e51f4fcae83c94dd66b61c3a8a88fe32c74823a5 100644
--- a/myems-modbus-tcp/README.md
+++ b/myems-modbus-tcp/README.md
@@ -118,7 +118,7 @@ modbus-tcp
 ```
 Data source connection example:
 ```
-{"host":"10.9.67.99","port":502, "interval_in_seconds":60]}
+{"host":"10.9.67.99","port":502,"interval_in_seconds":60]}
 ```
 
 Point address example: