Index: /branches/amp_3_7/extensions/license_server/webui/client/device/deivce-import-amp.controller.js
===================================================================
--- /branches/amp_3_7/extensions/license_server/webui/client/device/deivce-import-amp.controller.js	(revision 2623)
+++ /branches/amp_3_7/extensions/license_server/webui/client/device/deivce-import-amp.controller.js	(working copy)
@@ -12,6 +12,7 @@
         'localStorageService',
         function ($scope, $rootScope, $state, $stateParams, $uibModalInstance, $uibModal, $filter, deviceService, vloumeLicenseService, localStorageService) {
             var addViewModal = this;
+            addViewModal.deviceList = [];
 
             addViewModal.close = function () {
                 $uibModalInstance.dismiss();
Index: /branches/amp_3_7/extensions/license_server/webui/client/device/deivce-import-amp.html
===================================================================
--- /branches/amp_3_7/extensions/license_server/webui/client/device/deivce-import-amp.html	(revision 2623)
+++ /branches/amp_3_7/extensions/license_server/webui/client/device/deivce-import-amp.html	(working copy)
@@ -1,28 +1,36 @@
 <div>
     <div class="modal-header">
-        <button type="button" class="close" ng-click="import.close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <button type="button" class="close" ng-click="import.close()" aria-label="Close"><span aria-hidden="true">&times;</span>
+        </button>
         <h4>{{ 'Select Device' | T}}</h4>
     </div>
     <div class="form-wrapper">
         <form class="form-horizontal" name="importDeviceForm" verify-scope="tipStyle: 1">
-            <div class="form-group">
+            <div class="form-group" ng-if="import.deviceList.length > 0">
                 <label class="col-md-3 control-label">{{ 'Device' | T }}</label>
                 <div class="col-md-8">
                     <select bs-select multiple class="form-control selectpick" ng-model="import.device">
-                        <option ng-repeat="device in import.deviceList" value="{{ device.name }}">{{ device.name }}</option>
+                        <option ng-repeat="device in import.deviceList" value="{{ device.name }}">{{ device.name }}
+                        </option>
                     </select>
                 </div>
             </div>
+            <div class="form-wrapper" ng-if="import.deviceList.length == 0">
+                <div class="form-group">
+                    <label class="col-md-6 control-label">{{ 'Loading / No Device' | T }}</label>
+                </div>
+            </div>
             <div class="form-group">
-               <div class="col-md-offset-3 col-md-8">
-                    <button ng-verify="control:'importDeviceForm'" class="btn btn-primary" ng-click="import.submit()" id="addSubmit">{{ 'Import' | T}}</button>
+                <div class="col-md-offset-3 col-md-8">
+                    <button ng-if="import.deviceList.length > 0" ng-verify="control:'importDeviceForm'"
+                            class="btn btn-primary" ng-click="import.submit()"
+                            id="addSubmit">{{ 'Import' | T}}
+                    </button>
                     <button class="btn btn-default" ng-click="import.close()">{{ 'Cancel' | T}}</button>
                 </div>
             </div>
-
         </form>
     </div>
-
 </div>
 
 <style>