diff --git a/src/components/form/input.tsx b/src/components/form/input.tsx
index 59db9c2..addbd4e 100644
--- a/src/components/form/input.tsx
+++ b/src/components/form/input.tsx
@@ -1,6 +1,5 @@
 import { IonInput } from "@ionic/react";
 import { Controller } from "react-hook-form";
-
 import FormError from "./error";
 
 function FormInput({
diff --git a/src/components/form/radio.tsx b/src/components/form/radio.tsx
index d9b4b82..c673d1c 100644
--- a/src/components/form/radio.tsx
+++ b/src/components/form/radio.tsx
@@ -1,4 +1,4 @@
-import { IonRadio, IonLabel, IonRadioGroup, IonItem } from "@ionic/react";
+import { IonItem, IonLabel, IonRadio, IonRadioGroup } from "@ionic/react";
 import { Controller } from "react-hook-form";
 import "./radio.css";
 
diff --git a/src/components/form/select.tsx b/src/components/form/select.tsx
index e3b9501..0345cbc 100644
--- a/src/components/form/select.tsx
+++ b/src/components/form/select.tsx
@@ -1,8 +1,6 @@
 import { IonItem, IonLabel, IonSelect, IonSelectOption } from "@ionic/react";
 import { Controller } from "react-hook-form";
-
 import FormError from "./error";
-
 import "./select.css";
 
 function FormSelect({
diff --git a/src/pages/cart/Cart.tsx b/src/pages/cart/Cart.tsx
index de005a1..661cbf6 100644
--- a/src/pages/cart/Cart.tsx
+++ b/src/pages/cart/Cart.tsx
@@ -1,10 +1,10 @@
-import { IonContent, IonFooter, IonList, IonPage } from "@ionic/react";
 import Commerce from "@chec/commerce.js";
+import { IonContent, IonFooter, IonList, IonPage } from "@ionic/react";
 import { useEffect, useState } from "react";
 import { useHistory } from "react-router";
-import "./Cart.css";
 import { CartItem } from "../../components/cart/item";
 import { Header } from "../../components/global/Header";
+import "./Cart.css";
 
 const Cart: React.FC = () => {
   const [cart, setCart] = useState(null);
diff --git a/src/pages/cart/CartPayment.tsx b/src/pages/cart/CartPayment.tsx
index 17279e3..46014de 100644
--- a/src/pages/cart/CartPayment.tsx
+++ b/src/pages/cart/CartPayment.tsx
@@ -1,3 +1,4 @@
+import Commerce from "@chec/commerce.js";
 import {
   IonCol,
   IonContent,
@@ -7,20 +8,20 @@ import {
   IonRow,
 } from "@ionic/react";
 import {
-  CardNumberElement,
-  CardExpiryElement,
   CardCvcElement,
+  CardExpiryElement,
+  CardNumberElement,
+  useElements,
+  useStripe,
 } from "@stripe/react-stripe-js";
-import { useStripe, useElements } from "@stripe/react-stripe-js";
-import Commerce from "@chec/commerce.js";
 import { useEffect, useState } from "react";
-import { RouteComponentProps, useHistory } from "react-router";
 import { FormProvider, useForm } from "react-hook-form";
-import FormInput from "../../components/form/input";
-import FormCheckbox from "../../components/form/checkbox";
+import { RouteComponentProps, useHistory } from "react-router";
 import AddressFields from "../../components/cart/address";
-import { useLoader } from "../../context/loading";
+import FormCheckbox from "../../components/form/checkbox";
+import FormInput from "../../components/form/input";
 import { Header } from "../../components/global/Header";
+import { useLoader } from "../../context/loading";
 
 interface CartPaymentPageProps
   extends RouteComponentProps<{
diff --git a/src/pages/cart/CartShipping.tsx b/src/pages/cart/CartShipping.tsx
index c5143f0..066e930 100644
--- a/src/pages/cart/CartShipping.tsx
+++ b/src/pages/cart/CartShipping.tsx
@@ -1,3 +1,4 @@
+import Commerce from "@chec/commerce.js";
 import {
   IonCol,
   IonContent,
@@ -6,14 +7,13 @@ import {
   IonPage,
   IonRow,
 } from "@ionic/react";
-import Commerce from "@chec/commerce.js";
 import { useEffect, useRef, useState } from "react";
+import { FormProvider, useForm } from "react-hook-form";
 import { RouteComponentProps, useHistory } from "react-router";
-import "./Cart.css";
-import { useForm, FormProvider } from "react-hook-form";
-import FormRadio from "../../components/form/radio";
 import AddressFields from "../../components/cart/address";
+import FormRadio from "../../components/form/radio";
 import { Header } from "../../components/global/Header";
+import "./Cart.css";
 
 interface CartShippingPageProps
   extends RouteComponentProps<{
diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx
index 9fd61c7..cfbf438 100644
--- a/src/pages/home/Home.tsx
+++ b/src/pages/home/Home.tsx
@@ -1,11 +1,11 @@
-import { IonCol, IonContent, IonGrid, IonPage, IonRow } from "@ionic/react";
-import "./Home.css";
 import Commerce from "@chec/commerce.js";
+import { IonCol, IonContent, IonGrid, IonPage, IonRow } from "@ionic/react";
 import { useEffect, useState } from "react";
-import ProductCard from "../../components/product/product-card/ProductCard";
-import { Footer } from "../../components/global/Footer";
 import { RouteComponentProps } from "react-router";
+import { Footer } from "../../components/global/Footer";
 import { Header } from "../../components/global/Header";
+import ProductCard from "../../components/product/product-card/ProductCard";
+import "./Home.css";
 
 const Home: React.FC<RouteComponentProps> = ({ history }) => {
   const [products, setProducts] = useState([]);
diff --git a/src/pages/order/Order.tsx b/src/pages/order/Order.tsx
index fb14121..20af438 100644
--- a/src/pages/order/Order.tsx
+++ b/src/pages/order/Order.tsx
@@ -7,12 +7,12 @@ import {
   IonPage,
   IonRow,
 } from "@ionic/react";
-import "./Order.css";
+import { chevronBack } from "ionicons/icons";
 import { useRef } from "react";
 import { RouteComponentProps, useHistory } from "react-router";
 import { Footer } from "../../components/global/Footer";
-import { chevronBack } from "ionicons/icons";
 import { Header } from "../../components/global/Header";
+import "./Order.css";
 
 const OrderDetail: React.FC<RouteComponentProps> = () => {
   const history = useHistory();
diff --git a/src/pages/product/Product.tsx b/src/pages/product/Product.tsx
index c0c1d77..9c315aa 100644
--- a/src/pages/product/Product.tsx
+++ b/src/pages/product/Product.tsx
@@ -1,11 +1,11 @@
-import { IonContent, IonPage } from "@ionic/react";
-import "./Product.css";
 import Commerce from "@chec/commerce.js";
+import { IonContent, IonPage } from "@ionic/react";
 import { useEffect, useRef, useState } from "react";
 import { RouteComponentProps, useHistory } from "react-router";
-import ProductListing from "../../components/product/listing/ProductListing";
 import { Footer } from "../../components/global/Footer";
 import { Header } from "../../components/global/Header";
+import ProductListing from "../../components/product/listing/ProductListing";
+import "./Product.css";
 
 interface ProductDetailPageProps
   extends RouteComponentProps<{