diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 2bbf07bb..1409c829 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -93,8 +93,7 @@ $(document).on('turbolinks:load', function() {
 	     var oqs_append = $('.oqs_append');
 	     oqs_append.empty();
 	     var filter = $('.filter').text();
-
-	     console.log(table_id)
+	     
 	    //Start Ajax
 	    $.ajax({      
 	      type: "GET",         
diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb
index f12778af..991f4ad2 100755
--- a/app/controllers/print_settings_controller.rb
+++ b/app/controllers/print_settings_controller.rb
@@ -18,10 +18,12 @@ class PrintSettingsController < ApplicationController
   # GET /print_settings/new
   def new
     @print_setting = PrintSetting.new
+    @server_mode = ENV["SERVER_MODE"]
   end
 
   # GET /print_settings/1/edit
   def edit
+    @server_mode = ENV["SERVER_MODE"]
   end
 
   # POST /print_settings
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index d3e4729d..329e9240 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -11,8 +11,8 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
     <!-- Google Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+    <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> -->
 
     <%= stylesheet_link_tag    'login', media: 'all', 'data-turbolinks-track': 'reload' %>
     
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index bec1b931..18ed2ab3 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -1,4 +1,3 @@
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <div class="card">
@@ -11,7 +10,16 @@
           <%= f.input :unique_code %>
           <%= f.input :template %>
           <%= f.input :font %>
-          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
+          <%
+            if(@server_mode != 'cloud')
+          %>
+            <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
+          <%
+             else              
+          %>
+            <%= f.input :printer_name, :as => :select, :collection => [], include_blank: false %>
+          <% end %>
+
           <%= f.input :brand_name %>
           <%= f.input :printer_type %>
           <%= f.input :api_settings %>
@@ -64,20 +72,38 @@
 
 <script type="text/javascript">
   $(document).ready(function(){
+    var serverMode = "<%= @server_mode %>";    
+    if(serverMode == 'cloud'){
+      var printers = code2lab.getPrinters();      
+      var printerInfo = JSON.parse([printers]); 
+      var select = $("#print_setting_printer_name"); 
+
+      $.each(printerInfo, function(key, value) {      
+       $('#print_setting_printer_name')
+           .append($("<option></option>")
+                      .attr("value",value.target)
+                      .text(value.deviceName)); 
+      }); 
+    } 
 
       // if selected printer change call and bind 
-      $("#print_setting_printer_name").on("change", function(){
-        var printer_name = $(this).val();        
-        $.ajax({
-          type: "GET",
-          url: "/get_printer_options/"+printer_name,          
-          success:function(result){             
-            $("#print_setting_brand_name").val(result.model);
-            $("#print_setting_api_settings").val(result.url);
-          }
-        });
-      });
-  });
+      $("#print_setting_printer_name").on("change", function(){        
+        if(serverMode != 'cloud'){
+          var printer_name = $(this).val();        
+          $.ajax({
+            type: "GET",
+            url: "/get_printer_options/"+printer_name,          
+            success:function(result){             
+              $("#print_setting_brand_name").val(result.model);
+              $("#print_setting_api_settings").val(result.url);
+            }
+          });
+        }
+        else {
+          $("#print_setting_api_settings").val($(this).val());
+        }
+      });    
+  });  
 
   function isNumberKey(evt) {
       var charCode = (evt.which) ? evt.which : event.keyCode;
diff --git a/config/secrets.yml b/config/secrets.yml
index 076b6691..111e1843 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: connect.smartsales.dev/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
+  server_mode: cloud
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L