diff --git a/includes/items/check.php b/includes/items/check.php
index e8a6f77e..7d02b22c 100644
--- a/includes/items/check.php
+++ b/includes/items/check.php
@@ -9,19 +9,21 @@
     "wpt_inside_check_{$temp_number}",
 );
 $check_class = implode(" ", $check_class_arr);
-            
-            
-$wpt_single_check = false;
-$wpt_single_check .= "<input "
-    . "data-product_type='" . $product->get_type() . "' "
-    . "id='check_id_{$temp_number}_" . $data['id'] . "' "
-    . "data-temp_number='{$temp_number}' "
-    . "data-product_id='" . $data['id'] . "' "
-    . "class='" . esc_attr( $check_class ) . "'"
-    . "type='checkbox' "
-    . "value='0'"
-    . ( $checkbox == 'wpt_checked_table' && $enable_disable == 'enabled' ? " checked='checked'" : "" )
-    . ">"
-    . "<label for='check_id_{$temp_number}_" . $data['id'] . "'></label>";
-echo wp_kses_post( $wpt_single_check );
+
+?>    
+<input 
+    data-product_type='<?php echo esc_attr( $product->get_type() ); ?>' 
+    id='<?php echo esc_attr( "check_id_{$temp_number}_{$data['id']}" ); ?>' 
+    data-temp_number='<?php echo esc_attr( $temp_number ); ?>' 
+    data-product_id='<?php echo esc_attr( $data['id'] ); ?>' 
+    class='<?php echo esc_attr( $check_class ); ?>' 
+    type='checkbox' value='0'
+    <?php 
+    $this_checkbox = ( $checkbox == 'wpt_checked_table' && $enable_disable == 'enabled' ? " checked='checked'" : "" );
+    echo esc_attr( $this_checkbox );
+    ?>
+    >
+    <label for='<?php echo esc_attr( "check_id_{$temp_number}_{$data['id']}" ); ?>'></label>
+    
+
               
\ No newline at end of file
diff --git a/includes/items/quoterequest.php b/includes/items/quoterequest.php
index 9fb45ad7..4104dbf8 100644
--- a/includes/items/quoterequest.php
+++ b/includes/items/quoterequest.php
@@ -7,4 +7,18 @@
 }
 $Add_to_Quote = $config_value['yith_add_to_quote_text'];//'Add to Quote';
 $data_message = '{"text":"'. $Add_to_Quote .'","adding":"' . $config_value['yith_add_to_quote_adding'] . '","added":"' . $config_value['yith_add_to_quote_added'] . '"}';
-echo "<a data-yith_browse_list='{$config_value['yith_browse_list']}' data-response_msg='' data-msg='{$data_message}' data-wp_nonce='{$wpt_nonce}' data-quote_data='' data-variation='' data-variation_id='' data-product_id='{$data['id']}' class='{$quote_class} yith_request_temp_{$temp_number}_id_{$data['id']} wpt_yith_add_to_quote_request wpt_add-request-quote-button button' href='#' data-quantity='{$default_quantity}' data-selector='yith_request_temp_{$temp_number}_id_{$data['id']}'>{$Add_to_Quote}</a>";
\ No newline at end of file
+?>
+<a data-yith_browse_list='<?php echo esc_attr( $config_value['yith_browse_list'] ); ?>' 
+   data-response_msg='' 
+   data-msg='<?php echo esc_attr( $data_message ); ?>' 
+   data-wp_nonce='<?php echo esc_attr( $wpt_nonce ); ?>' 
+   data-quote_data='' 
+   data-variation='' 
+   data-variation_id='' 
+   data-product_id='<?php echo esc_attr( $data['id'] ); ?>' 
+   class='<?php echo esc_attr( "{$quote_class} yith_request_temp_{$temp_number}_id_{$data['id']} wpt_yith_add_to_quote_request wpt_add-request-quote-button button" ); ?>' 
+   href='#' 
+   data-quantity='<?php echo esc_attr( $default_quantity ); ?>' 
+   data-selector='<?php echo esc_attr( "yith_request_temp_{$temp_number}_id_{$data['id']}" ); ?>'>
+   <?php echo esc_html( $Add_to_Quote ); ?>
+</a>
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 8bd7c2c4..26697bf7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://codecanyon.net/item/woo-product-table-pro/20676867?ref=Code
 Tags: wc product table,woocommerce product table, product table, wc table, quick order table, wholesale table, restaurants table
 Requires at least: 4.0.0
 Tested up to: 5.7.2
-Stable tag: 2.8.9
+Stable tag: 2.9.0
 Requires PHP: 5.6
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html