diff --git a/view/frontend/templates/buynow-list.phtml b/view/frontend/templates/buynow-list.phtml
index 1d1b9a5..0a98612 100755
--- a/view/frontend/templates/buynow-list.phtml
+++ b/view/frontend/templates/buynow-list.phtml
@@ -11,6 +11,7 @@
 ?>
 <?php
 /** @var \Mageprince\BuyNow\Block\Product\ListProduct $block */
+/** @var $escaper \Magento\Framework\Escaper */
 $product = $block->getProduct();
 ?>
 <?php $helper = $this->helper(\Mageprince\BuyNow\Helper\Data::class); ?>
@@ -18,27 +19,27 @@ $product = $block->getProduct();
 <?php if ($product->isSaleable()): ?>
     <?php $postParams = $block->getAddToCartPostParams($product); ?>
     <div class="buynow-btn">
-        <form action="<?= /* @noEscape */ $postParams['action']; ?>"
+        <form action="<?= $escaper->escapeUrl($postParams['action']); ?>"
               id="product_addtocart_form_<?= /* @noEscape */ $postParams['data']['product']; ?>"
               method="post">
             <input type="hidden"
                    name="product"
                    value="<?= /* @noEscape */ $postParams['data']['product']; ?>">
             <input type="hidden"
-                   name="<?= /* @noEscape */ 'uenc'; ?>"
+                   name="uenc"
                    value="<?= /* @noEscape */ $postParams['data']['uenc']; ?>">
             <?= $block->getBlockHtml('formkey') ?>
             <button type="submit"
-                    title="<?= $block->escapeHtml(__($buttonTitle)) ?>"
+                    title="<?= $escaper->escapeHtml(__($buttonTitle)) ?>"
                     class="action tocart buynow primary"
                     data-mage-init='
                     {
                         "Mageprince_BuyNow/js/buy-now": {
-                            "form": "#product_addtocart_form_<?= /* @noEscape */ $postParams['data']['product'] ?>"
+                            "form": "#product_addtocart_form_<?= $escaper->escapeHtml($postParams['data']['product']) ?>"
                         }
                     }
                 '>
-                <span><?= /* @noEscape */ __($buttonTitle) ?></span>
+                <span><?= $escaper->escapeHtml(__($buttonTitle)) ?></span>
             </button>
         </form>
     </div>
diff --git a/view/frontend/templates/buynow-view.phtml b/view/frontend/templates/buynow-view.phtml
index 668e0a6..8269063 100755
--- a/view/frontend/templates/buynow-view.phtml
+++ b/view/frontend/templates/buynow-view.phtml
@@ -8,22 +8,23 @@
  * @license http://opensource.org/licenses/gpl-3.0.html GNU General Public License,version 3 (GPL-3.0)
  * @author MagePrince <info@mageprince.com>
  */
+/** @var $escaper \Magento\Framework\Escaper */
 ?>
 <?php $helper = $this->helper(\Mageprince\BuyNow\Helper\Data::class); ?>
 <?php $formId = $helper->getAddToCartFormId(); ?>
 <?php $buttonTitle = $helper->getButtonTitle() ?>
 <div class="buynow-button">
     <button type="submit"
-            title="<?= /* @noEscape */ __($buttonTitle) ?>"
+            title="<?= $escaper->escapeHtml(__($buttonTitle)) ?>"
             id="buy-now"
-            class="action tocart primary"
+            class="action primary buy-now-btn"
             data-mage-init='
             {
                 "Mageprince_BuyNow/js/buy-now": {
-                    "form": "#<?= /* @noEscape */ $formId; ?>"
+                    "form": "#<?= $escaper->escapeHtml($formId); ?>"
                 }
             }
             '>
-        <span><?= /* @noEscape */ __($buttonTitle) ?></span>
+        <span><?= $escaper->escapeHtml(__($buttonTitle)) ?></span>
     </button>
 </div>
diff --git a/view/frontend/web/css/source/_module.less b/view/frontend/web/css/source/_module.less
index b98460f..e6ff8a9 100644
--- a/view/frontend/web/css/source/_module.less
+++ b/view/frontend/web/css/source/_module.less
@@ -10,9 +10,16 @@
   float: left;
 }
 
+.buy-now-btn {
+    margin-right: 1%;
+    width: 49%;
+    line-height: 3.6rem;
+}
+
 @media(max-width: 767px){
   .catalog-category-view button.buynow{
     margin-top: 5px;
     margin-left: 0px;
   }
-}
\ No newline at end of file
+}
+