diff --git a/.env.template b/.env.template
index 23627e5fb..1f0fe0536 100644
--- a/.env.template
+++ b/.env.template
@@ -20,3 +20,6 @@ NEXT_PUBLIC_SWELL_PUBLIC_KEY=
 
 NEXT_PUBLIC_SALEOR_API_URL=
 NEXT_PUBLIC_SALEOR_CHANNEL=
+
+NEXT_PUBLIC_VENDURE_SHOP_API_URL=
+NEXT_PUBLIC_VENDURE_LOCAL_URL=
diff --git a/README.md b/README.md
index 8204b3445..d53c5ed86 100644
--- a/README.md
+++ b/README.md
@@ -151,5 +151,5 @@ Next, you're free to customize the starter. More updates coming soon. Stay tuned
 After Email confirmation, Checkout should be manually enabled through BigCommerce platform. Look for "Review & test your store" section through BigCommerce's dashboard.
 <br>
 <br>
-BigCommerce team has been notified and they plan to add more detailed about this subject.
+BigCommerce team has been notified and they plan to add more details about this subject.
 </details>
diff --git a/assets/base.css b/assets/base.css
index 00081f459..05a234a73 100644
--- a/assets/base.css
+++ b/assets/base.css
@@ -77,7 +77,6 @@ html {
   height: 100%;
   box-sizing: border-box;
   touch-action: manipulation;
-  font-feature-settings: 'case' 1, 'rlig' 1, 'calt' 0;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
diff --git a/components/auth/LoginView.tsx b/components/auth/LoginView.tsx
index 35ff98f66..5e513deb9 100644
--- a/components/auth/LoginView.tsx
+++ b/components/auth/LoginView.tsx
@@ -38,6 +38,7 @@ const LoginView: FC<Props> = () => {
     } catch ({ errors }) {
       setMessage(errors[0].message)
       setLoading(false)
+      setDisabled(false)
     }
   }
 
diff --git a/components/product/ProductCard/ProductCard.tsx b/components/product/ProductCard/ProductCard.tsx
index 39c19db00..95f2f3f07 100644
--- a/components/product/ProductCard/ProductCard.tsx
+++ b/components/product/ProductCard/ProductCard.tsx
@@ -7,6 +7,7 @@ import Image, { ImageProps } from 'next/image'
 import WishlistButton from '@components/wishlist/WishlistButton'
 import usePrice from '@framework/product/use-price'
 import ProductTag from '../ProductTag'
+
 interface Props {
   className?: string
   product: Product
@@ -23,7 +24,6 @@ const ProductCard: FC<Props> = ({
   className,
   noNameTag = false,
   variant = 'default',
-  ...props
 }) => {
   const { price } = usePrice({
     amount: product.price.value,
@@ -38,7 +38,7 @@ const ProductCard: FC<Props> = ({
   )
 
   return (
-    <Link href={`/product/${product.slug}`} {...props}>
+    <Link href={`/product/${product.slug}`}>
       <a className={rootClassName}>
         {variant === 'slim' && (
           <>
diff --git a/framework/bigcommerce/auth/use-login.tsx b/framework/bigcommerce/auth/use-login.tsx
index 3ebacc9b7..d366b5260 100644
--- a/framework/bigcommerce/auth/use-login.tsx
+++ b/framework/bigcommerce/auth/use-login.tsx
@@ -16,7 +16,7 @@ export const handler: MutationHook<LoginHook> = {
     if (!(email && password)) {
       throw new CommerceError({
         message:
-          'A first name, last name, email and password are required to login',
+          'An email and password are required to login',
       })
     }
 
diff --git a/framework/shopify/auth/use-login.tsx b/framework/shopify/auth/use-login.tsx
index d4369b7c2..e1de89c99 100644
--- a/framework/shopify/auth/use-login.tsx
+++ b/framework/shopify/auth/use-login.tsx
@@ -22,7 +22,7 @@ export const handler: MutationHook<LoginHook> = {
     if (!(email && password)) {
       throw new CommerceError({
         message:
-          'A first name, last name, email and password are required to login',
+          'An email and password are required to login',
       })
     }