diff --git a/i18n/en_US.csv b/i18n/en_US.csv
new file mode 100644
index 0000000..7b67709
--- /dev/null
+++ b/i18n/en_US.csv
@@ -0,0 +1,15 @@
+"Card Number","Card Number"
+"Card Owner","Card Owner"
+"Expiration Date","Expiration Date"
+"Card Verification Number","Card Verification Number"
+"Installments","Installments"
+"What is this?","What is this?"
+"Choose a number of installments","Choose a number of installments"
+"Authorize","Authorize"
+"Authorize and capture","Authorize and capture"
+"Production","Production"
+"Test","Test"
+"Minimum amount for installment","Minimum amount for installment"
+"Maximum number of installments","Maximum number of installments"
+"Edit Your Cart","Edit Your Cart"
+"Forgot an Item?","Forgot an Item?"
\ No newline at end of file
diff --git a/i18n/pt_BR.csv b/i18n/pt_BR.csv
new file mode 100644
index 0000000..f8d97fb
--- /dev/null
+++ b/i18n/pt_BR.csv
@@ -0,0 +1,15 @@
+"Card Number","Número do cartão"
+"Card Owner","Titular do cartão"
+"Expiration Date","Data de validade"
+"Card Verification Number","Código de verificação do cartão"
+"Installments","Parcelas"
+"What is this?","O que é isso?"
+"Choose a number of installments","Selecionar o número de parcelas"
+"Authorize","Autorizar"
+"Authorize and capture","Autorizar e capturar"
+"Production","Produção"
+"Test","Sandbox"
+"Minimum amount for installment","Valor mínimo de parcela"
+"Maximum number of installments","Número máximo de parcelas"
+"Edit Your Cart","Alterar o Carrinho"
+"Forgot an Item?","Esqueceu algum item?"
\ No newline at end of file
diff --git a/view/frontend/web/template/payment/cc-form.html b/view/frontend/web/template/payment/cc-form.html
index 4f5d1ba..9895ce1 100644
--- a/view/frontend/web/template/payment/cc-form.html
+++ b/view/frontend/web/template/payment/cc-form.html
@@ -96,9 +96,10 @@
         </div>
     </div>
 
-    <img id="issuers"
+    <img class="rede_img-flag"
+         id="issuers"
          data-bind="attr: { src: getDefaultIssuers()}"
-         style="max-width: 415px"/>
+    />
 
     <div class="field text required">
         <label data-bind="attr: {for: getCode() + '_cc_owner'}" class="label">
@@ -120,7 +121,7 @@
 
     <div class="field date required" data-bind="attr: {id: getCode() + '_cc_type_exp_div'}">
         <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-            <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
+            <span class="rede_exp_card"><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
         </label>
         <div class="control">
             <div class="fields group group-2">
@@ -156,7 +157,7 @@
         </div>
     </div>
     <!-- ko if: (hasVerification())-->
-    <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}">
+    <div class="field cvv required" style="width: auto;" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}">
         <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
             <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
         </label>
@@ -219,19 +220,23 @@
 
 <style type="text/css">
     .rede input, select.installments {
-        width: 413px !important;
+        width: 100% !important;
     }
 
     .rede select.select-month {
-        width: 298px !important;
+        width: 100% !important;
     }
 
     .rede select.select-year {
-        width: 110px !important;
+        width: 150% !important;
     }
 
     .rede input.cvv {
-        width: 100px !important;
+        width: 85% !important;
+    }
+
+    .rede .cvv .field-tooltip {
+        left: 80%;
     }
 
     .rede .checkbutton {
@@ -239,4 +244,20 @@
         padding: 10px 30px 0 0;
         line-height: 20px;
     }
+    .rede_img-flag {
+        max-width: 75%;
+        margin-left: 8px;
+    }
+    .rede_exp_card {
+        margin-left: 10px;
+    }
+    @media (max-width: 680px) {
+        .rede_img-flag {
+            max-width: 90%;
+        }
+        .rede_exp_card {
+            margin-left: 0px;
+        }
+    }
+
 </style>
\ No newline at end of file
diff --git a/view/frontend/web/template/payment/form.html b/view/frontend/web/template/payment/form.html
index b5d9d90..43acd37 100644
--- a/view/frontend/web/template/payment/form.html
+++ b/view/frontend/web/template/payment/form.html
@@ -34,7 +34,7 @@
         </form>
         <div class="checkout-agreements-block">
             <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
             <!--/ko-->
         </div>
 
@@ -53,9 +53,9 @@
                     <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
-            <div class="secondary">
+            <div class="secondary forgot-message" style="display: none;">
                 <span id="checkout-review-edit-label" data-bind="i18n: 'Forgot an Item?'"></span>
-                <a data-bind="attr: {href: $parents[1].cartUrl}"
+                <a data-bind="attr: {href: checkout/cart"
                    aria-describedby="checkout-review-edit-label"
                    class="action edit">
                     <span data-bind="i18n: 'Edit Your Cart'"></span>