diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 846f837..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "editor.defaultFormatter": "vscode.html-language-features",
-  "editor.formatOnSave": true,
-  "editor.formatOnPaste": true,
-  "[css]": {
-    "editor.defaultFormatter": "vscode.css-language-features"
-  }
-}
diff --git a/src/views/index.js b/src/views/index.js
index 324bbe2..e69de29 100644
--- a/src/views/index.js
+++ b/src/views/index.js
@@ -1,13 +0,0 @@
-
-// Smooth scrolling for Back To Top button
-document.addEventListener('DOMContentLoaded', function () {
-    var goUpButton = document.querySelector('.back-to-top');
-    goUpButton.addEventListener('click', function (e) {
-        e.preventDefault();
-        var scrollOptions = {
-            top: 0,
-            behavior: 'smooth'
-        };
-        window.scrollTo(scrollOptions);
-    });
-});
diff --git a/src/views/layouts/Cart/Cart.css b/src/views/layouts/Cart/Cart.css
index c01cf3d..dcf69cc 100644
--- a/src/views/layouts/Cart/Cart.css
+++ b/src/views/layouts/Cart/Cart.css
@@ -6,20 +6,17 @@
   position: relative;
   overflow: hidden;
 }
-
-.cart .main>.cell {
+.cart .main > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .cart .section1__section1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .cart .section1__flexCol {
   display: flex;
   flex-direction: column;
@@ -28,55 +25,46 @@
   flex-grow: 1;
   margin: 180px auto 103px;
 }
-
 @media (max-width: 1919px) {
   .cart .section1__flexCol {
     width: 86.95%;
   }
 }
-
 @media (max-width: 1399px) {
   .cart .section1__flexCol {
     width: 89.89%;
   }
 }
-
 @media (max-width: 1199px) {
   .cart .section1__flexCol {
     width: 92.22%;
   }
 }
-
 @media (max-width: 991px) {
   .cart .section1__flexCol {
     width: 94.05%;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__flexCol {
     width: 95.47%;
   }
 }
-
 @media (max-width: 575px) {
   .cart .section1__flexCol {
     width: 96.56%;
   }
 }
-
 @media (max-width: 479px) {
   .cart .section1__flexCol {
     width: 97.4%;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__flexCol {
     width: 98.04%;
   }
 }
-
 .cart .section1__title {
   display: flex;
   justify-content: flex-end;
@@ -88,45 +76,38 @@
   position: relative;
   margin: 0px auto;
 }
-
 @media (max-width: 2999px) {
   .cart .section1__title {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 1199px) {
   .cart .section1__title {
     font-size: 28px;
   }
 }
-
 @media (max-width: 991px) {
   .cart .section1__title {
     font-size: 24px;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__title {
     font-size: 20px;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__title {
     font-size: 12px;
   }
 }
-
 .cart .section1__flexRow {
   display: flex;
   align-items: center;
   position: relative;
   margin: 74px 0px 0px;
 }
-
 @media (max-width: 1399px) {
   .cart .section1__flexRow {
     flex-wrap: wrap;
@@ -135,49 +116,42 @@
     row-gap: 16px;
   }
 }
-
-.cart .section1__flexRow>.cell {
+.cart .section1__flexRow > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 0 744px;
   min-width: 744px;
 }
-
 @media (max-width: 1399px) {
-  .cart .section1__flexRow>.cell {
+  .cart .section1__flexRow > .cell {
     flex: 0 0 calc(100% - 0px);
     min-width: unset;
   }
 }
-
 .cart .section1__flexCol1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .cart .section1__flexRow1 {
   display: flex;
   align-items: center;
   position: relative;
 }
-
 .cart .section1__flexRow2 {
   display: flex;
   align-items: center;
   position: relative;
   flex: 0 1 282px;
 }
-
-.cart .section1__flexRow2>.cell {
+.cart .section1__flexRow2 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 174px;
 }
-
 .cart .section1__image {
   border-radius: 4px 4px 4px 4px;
   width: calc(100% - 0px);
@@ -188,11 +162,9 @@
   object-position: center center;
   position: relative;
 }
-
-.cart .section1__flexRow2>.spacer {
+.cart .section1__flexRow2 > .spacer {
   flex: 0 1 50px;
 }
-
 .cart .section1__flexCol2 {
   display: flex;
   flex-direction: column;
@@ -200,7 +172,6 @@
   flex: 0 1 58px;
   margin: 0px 0px 48px;
 }
-
 .cart .section1__subtitle {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -209,20 +180,17 @@
   min-height: 31px;
   margin: 0px 3px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__subtitle {
     font-size: 16px;
     text-align: left;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__subtitle {
     font-size: 12px;
   }
 }
-
 .cart .section1__highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -231,32 +199,27 @@
   min-height: 32px;
   margin: 17px 19px 0px 2px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights1 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 @media (max-width: 991px) {
   .cart .section1__highlights1 {
     margin: 17px 12px 0px 2px;
   }
 }
-
 @media (max-width: 575px) {
   .cart .section1__highlights1 {
     margin: 17px 8px 0px 2px;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__highlights1 {
     margin: 17px 4px 0px 2px;
   }
 }
-
 .cart .section1__highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -265,18 +228,15 @@
   min-height: 32px;
   margin: 2px 0px 0px 2px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow1>.spacer {
+.cart .section1__flexRow1 > .spacer {
   flex: 0 1 246px;
 }
-
 .cart .section1__content_box {
   display: flex;
   flex-direction: column;
@@ -286,7 +246,6 @@
   flex: 0 1 131px;
   margin: 0px 0px 99px;
 }
-
 .cart .section1__flexRow3 {
   display: flex;
   align-items: center;
@@ -294,37 +253,31 @@
   flex-grow: 1;
   margin: 17px 18px 14px 21px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__flexRow3 {
     margin: 17px 18px 14px 16px;
   }
 }
-
 @media (max-width: 991px) {
   .cart .section1__flexRow3 {
     margin: 17px 12px 14px 16px;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__flexRow3 {
     margin: 17px 8px 14px 12px;
   }
 }
-
 @media (max-width: 479px) {
   .cart .section1__flexRow3 {
     margin: 17px 8px 14px;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__flexRow3 {
     margin: 17px 4px 14px;
   }
 }
-
 .cart .section1__highlights11 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -334,18 +287,15 @@
   min-width: 11px;
   min-height: 32px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights11 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow3>.spacer {
+.cart .section1__flexRow3 > .spacer {
   flex: 0 1 31px;
 }
-
 .cart .section1__highlights12 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -355,14 +305,12 @@
   min-width: 6px;
   min-height: 32px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights12 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__highlights13 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -372,25 +320,21 @@
   min-width: 13px;
   min-height: 32px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights13 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow1>.spacer1 {
+.cart .section1__flexRow1 > .spacer1 {
   flex: 0 1 67px;
 }
-
-.cart .section1__flexRow1>.cell {
+.cart .section1__flexRow1 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 15px;
 }
-
 .cart .section1__icon {
   width: 15px;
   height: auto;
@@ -402,39 +346,33 @@
   min-width: 15px;
   margin: 0px 0px 147px;
 }
-
 .cart .section1__line {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 46px 0px 0px;
 }
-
 .cart .section1__flexRow4 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 46px 0px 0px;
 }
-
 .cart .section1__flexRow5 {
   display: flex;
   align-items: center;
   position: relative;
   flex: 0 1 391px;
 }
-
-.cart .section1__flexRow5>.cell {
+.cart .section1__flexRow5 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 174px;
 }
-
-.cart .section1__flexRow5>.spacer {
+.cart .section1__flexRow5 > .spacer {
   flex: 0 1 50px;
 }
-
 .cart .section1__flexCol3 {
   display: flex;
   flex-direction: column;
@@ -442,7 +380,6 @@
   flex: 0 1 167px;
   margin: 0px 0px 48px;
 }
-
 .cart .section1__subtitle1 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -450,20 +387,17 @@
   position: relative;
   min-height: 31px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__subtitle1 {
     font-size: 16px;
     text-align: left;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__subtitle1 {
     font-size: 12px;
   }
 }
-
 .cart .section1__highlights14 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -471,14 +405,12 @@
   position: relative;
   margin: 16px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights14 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__highlights2 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -486,18 +418,15 @@
   position: relative;
   margin: 3px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights2 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow4>.spacer {
+.cart .section1__flexRow4 > .spacer {
   flex: 0 1 137px;
 }
-
 .cart .section1__flexRow6 {
   display: flex;
   align-items: center;
@@ -505,37 +434,31 @@
   flex-grow: 1;
   margin: 16px 18px 14px 21px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__flexRow6 {
     margin: 16px 18px 14px 16px;
   }
 }
-
 @media (max-width: 991px) {
   .cart .section1__flexRow6 {
     margin: 16px 12px 14px 16px;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__flexRow6 {
     margin: 16px 8px 14px 12px;
   }
 }
-
 @media (max-width: 479px) {
   .cart .section1__flexRow6 {
     margin: 16px 8px 14px;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__flexRow6 {
     margin: 16px 4px 14px;
   }
 }
-
 .cart .section1__highlights15 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -545,18 +468,15 @@
   min-width: 11px;
   min-height: 33px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights15 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow6>.spacer {
+.cart .section1__flexRow6 > .spacer {
   flex: 0 1 31px;
 }
-
 .cart .section1__highlights16 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -566,14 +486,12 @@
   min-width: 6px;
   min-height: 33px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights16 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__highlights17 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -583,25 +501,21 @@
   min-width: 13px;
   min-height: 33px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights17 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow4>.spacer1 {
+.cart .section1__flexRow4 > .spacer1 {
   flex: 0 1 67px;
 }
-
-.cart .section1__flexRow4>.cell {
+.cart .section1__flexRow4 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 15px;
 }
-
 .cart .section1__image1 {
   width: 15px;
   height: auto;
@@ -613,32 +527,27 @@
   min-width: 15px;
   margin: 0px 0px 148px;
 }
-
 .cart .section1__line1 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 45px 0px 0px;
 }
-
 .cart .section1__flexRow7 {
   display: flex;
   align-items: center;
   position: relative;
   flex: 0 1 378px;
 }
-
-.cart .section1__flexRow7>.cell {
+.cart .section1__flexRow7 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 174px;
 }
-
-.cart .section1__flexRow7>.spacer {
+.cart .section1__flexRow7 > .spacer {
   flex: 0 1 50px;
 }
-
 .cart .section1__flexCol4 {
   display: flex;
   flex-direction: column;
@@ -646,7 +555,6 @@
   flex: 0 1 154px;
   margin: 0px 0px 48px;
 }
-
 .cart .section1__highlights18 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -655,14 +563,12 @@
   min-height: 32px;
   margin: 17px 1px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights18 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__highlights3 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -670,33 +576,27 @@
   position: relative;
   margin: 2px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights3 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow4>.spacer2 {
+.cart .section1__flexRow4 > .spacer2 {
   flex: 0 1 150px;
 }
-
-.cart .section1__flexRow3>.spacer1 {
+.cart .section1__flexRow3 > .spacer1 {
   flex: 0 1 31px;
 }
-
-.cart .section1__flexRow4>.spacer3 {
+.cart .section1__flexRow4 > .spacer3 {
   flex: 0 1 67px;
 }
-
-.cart .section1__flexRow4>.cell1 {
+.cart .section1__flexRow4 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 15px;
 }
-
 .cart .section1__content_box7 {
   display: flex;
   flex-direction: column;
@@ -708,7 +608,6 @@
   position: relative;
   margin: 46px 0% 0px 70.97%;
 }
-
 .cart .section1__highlights4 {
   display: flex;
   font: 700 18px/1.27 "DM Sans", Helvetica, Arial, serif;
@@ -720,27 +619,23 @@
   min-width: 120px;
   margin: 19px auto 21px;
 }
-
 @media (max-width: 2999px) {
   .cart .section1__highlights4 {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__highlights4 {
     font-size: 12px;
   }
 }
-
 .cart .section1__flexRow8 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 76px 0px 0px;
 }
-
 .cart .section1__flexCol5 {
   display: flex;
   flex-direction: column;
@@ -748,25 +643,21 @@
   flex: 0 1 431px;
   margin: 14px 0px 0px;
 }
-
 .cart .section1__info {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
   letter-spacing: 0px;
   position: relative;
 }
-
 .cart .section1__line3 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 25px 0px 0px;
 }
-
-.cart .section1__flexRow8>.spacer {
+.cart .section1__flexRow8 > .spacer {
   flex: 0 1 97px;
 }
-
 .cart .section1__content_box6 {
   display: flex;
   flex-direction: column;
@@ -779,7 +670,6 @@
   flex: 0 1 216px;
   margin: 0px 0px 1px;
 }
-
 .cart .section1__highlights21 {
   display: flex;
   font: 700 18px/1.27 "DM Sans", Helvetica, Arial, serif;
@@ -789,61 +679,51 @@
   flex-grow: 1;
   margin: 19px 40px 21px 39px;
 }
-
 @media (max-width: 2999px) {
   .cart .section1__highlights21 {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights21 {
     margin: 19px 32px 21px;
   }
 }
-
 @media (max-width: 991px) {
   .cart .section1__highlights21 {
     margin: 19px 28px 21px;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__highlights21 {
     font-size: 12px;
     margin: 19px 24px 21px 20px;
   }
 }
-
 @media (max-width: 575px) {
   .cart .section1__highlights21 {
     margin: 19px 20px 21px;
   }
 }
-
 @media (max-width: 479px) {
   .cart .section1__highlights21 {
     margin: 19px 16px 21px;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__highlights21 {
     margin: 19px 8px 21px;
   }
 }
-
-.cart .section1__flexRow>.spacer {
+.cart .section1__flexRow > .spacer {
   flex: 1 1 112px;
 }
-
 @media (max-width: 1399px) {
-  .cart .section1__flexRow>.spacer {
+  .cart .section1__flexRow > .spacer {
     display: none;
   }
 }
-
 .cart .section1__content_box5 {
   display: flex;
   flex-direction: column;
@@ -853,7 +733,6 @@
   flex-grow: 1;
   margin: 0px 0px 44px;
 }
-
 .cart .section1__flexCol6 {
   display: flex;
   flex-direction: column;
@@ -862,123 +741,104 @@
   flex-grow: 1;
   margin: 47px auto 57px;
 }
-
 @media (max-width: 767px) {
   .cart .section1__flexCol6 {
     width: 83.97%;
   }
 }
-
 @media (max-width: 575px) {
   .cart .section1__flexCol6 {
     width: 87.48%;
   }
 }
-
 @media (max-width: 479px) {
   .cart .section1__flexCol6 {
     width: 90.31%;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__flexCol6 {
     width: 92.55%;
   }
 }
-
 .cart .section1__medium_title {
   font: 400 26px/0.96 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 @media (max-width: 991px) {
   .cart .section1__medium_title {
     font-size: 20px;
     text-align: left;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__medium_title {
     font-size: 16px;
   }
 }
-
 @media (max-width: 383px) {
   .cart .section1__medium_title {
     font-size: 12px;
   }
 }
-
 .cart .section1__flexCol7 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 53px 1px 0px 0px;
 }
-
-.cart .section1__flexCol7>.cell {
+.cart .section1__flexCol7 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 1;
 }
-
 .cart .section1__flexRow9 {
   display: flex;
   align-items: center;
   position: relative;
   flex-grow: 1;
 }
-
 .cart .section1__highlights5_box {
   position: relative;
   flex: 0 0 auto;
   min-width: 108px;
   margin: 0px 0px 39px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights5_box {
     align-items: flex-start;
     justify-content: flex-start;
   }
 }
-
 .cart .section1__highlights5 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights5 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__highlights5_span0 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .cart .section1__highlights5_span1 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
-.cart .section1__flexRow9>.spacer {
+.cart .section1__flexRow9 > .spacer {
   flex: 0 1 430px;
 }
-
 .cart .section1__highlights19 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -986,26 +846,22 @@
   position: relative;
   flex: 0 1 40px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights19 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexCol7>.cell1 {
+.cart .section1__flexCol7 > .cell1 {
   margin-top: -4px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 0;
 }
-
-.cart .section1__flexRow9>.spacer1 {
+.cart .section1__flexRow9 > .spacer1 {
   flex: 0 1 164px;
 }
-
 .cart .section1__highlights110 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -1013,21 +869,18 @@
   position: relative;
   flex: 1 1 320px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights110 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__flexCol8 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 47px 0px 0px;
 }
-
 .cart .section1__flexCol9 {
   display: flex;
   flex-direction: column;
@@ -1035,21 +888,18 @@
   position: relative;
   margin: 0px 0% 0px 45.87%;
 }
-
 .cart .section1__highlights51 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights51 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__info1 {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -1057,21 +907,18 @@
   position: relative;
   margin: 28px 0px 0px;
 }
-
 .cart .section1__line2 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 15px 1px 0px 0px;
 }
-
 .cart .section1__flexRow10 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 27px 0px 0px;
 }
-
 .cart .section1__info2 {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -1081,18 +928,15 @@
   min-width: 33px;
   min-height: 24px;
 }
-
-.cart .section1__flexRow10>.spacer {
+.cart .section1__flexRow10 > .spacer {
   flex: 0 1 277px;
 }
-
-.cart .section1__flexRow10>.cell {
+.cart .section1__flexRow10 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 11px;
 }
-
 .cart .section1__image2 {
   width: 11px;
   height: auto;
@@ -1104,7 +948,6 @@
   min-width: 11px;
   margin: 11px 0px 8px;
 }
-
 .cart .section1__info3 {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -1112,7 +955,6 @@
   position: relative;
   margin: 27px 0px 0px;
 }
-
 .cart .section1__content_box3 {
   display: flex;
   flex-direction: column;
@@ -1123,7 +965,6 @@
   position: relative;
   margin: 28px 1px 0px 0px;
 }
-
 .cart .section1__highlights41 {
   display: flex;
   font: 700 18px/1.27 "DM Sans", Helvetica, Arial, serif;
@@ -1135,34 +976,29 @@
   min-width: 138px;
   margin: 19px auto 21px;
 }
-
 @media (max-width: 2999px) {
   .cart .section1__highlights41 {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__highlights41 {
     font-size: 12px;
   }
 }
-
 .cart .section1__line11 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 46px 1px 0px 0px;
 }
-
 .cart .section1__flexRow11 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 49px 0px 0px;
 }
-
 .cart .section1__highlights31 {
   font: 700 16px/1.31 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -1172,18 +1008,15 @@
   min-width: 97px;
   min-height: 29px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights31 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.cart .section1__flexRow11>.spacer {
+.cart .section1__flexRow11 > .spacer {
   flex: 0 1 441px;
 }
-
 .cart .section1__highlights32 {
   font: 700 16px/1.31 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -1193,14 +1026,12 @@
   min-width: 41px;
   margin: 0px 0px 8px;
 }
-
 @media (max-width: 1199px) {
   .cart .section1__highlights32 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .cart .section1__content_box4 {
   display: flex;
   flex-direction: column;
@@ -1212,7 +1043,6 @@
   position: relative;
   margin: 53px 1px 0px 0px;
 }
-
 .cart .section1__highlights22 {
   display: flex;
   font: 700 18px/1.27 "DM Sans", Helvetica, Arial, serif;
@@ -1223,20 +1053,17 @@
   flex-grow: 1;
   margin: 20px auto;
 }
-
 @media (max-width: 2999px) {
   .cart .section1__highlights22 {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 767px) {
   .cart .section1__highlights22 {
     font-size: 12px;
   }
 }
-
 .cart .section2 {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/Cart/Cart.html b/src/views/layouts/Cart/Cart.html
index f309b72..65df661 100644
--- a/src/views/layouts/Cart/Cart.html
+++ b/src/views/layouts/Cart/Cart.html
@@ -1,3 +1,9 @@
+<!-- Changes:
+OnClick - changed to full path
+Tags closures - removed extra /div in header. applied to all
+Coupon code input
+Newsletter input -->
+
 <!DOCTYPE html>
 <html>
 
@@ -9,20 +15,51 @@
     href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
     integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
   <!-- Font Awesome is an icon library -->
+
   <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
   <!-- 'Animate On Scroll' library -->
+
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
   <!-- Bootstrap linker -->
 
   <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
+  <link rel="stylesheet" type="text/css" href="/css/common.css" />
+  <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+  <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
   <link rel="stylesheet" type="text/css" href="/src/views/layouts/Cart/Cart.css" />
   <link rel="stylesheet" type="text/css" href="/src/views/partials/Header/Header0.css" />
   <link rel="stylesheet" type="text/css" href="/src/views/partials/Footer/Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
   <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
   <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
 </head>
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\Cart\Cart.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+  </head>
 
 <body class="flex-column">
   <header id="header" class="headroom">
@@ -30,7 +67,7 @@
       <!-- prettier-ignore -->
       <div class="header0 header0__group1">
         <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="">Urusta.</h2>
+          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
           <div class="spacer"></div>
           <div class="header0__box">
             <div class="header0__flexRow1">
@@ -41,17 +78,14 @@ <h2 class="header0__medium_title" onclick="">Urusta.</h2>
                 </px-grid>
               </div>
               <div class="cell1">
-                <h4 class="header0__highlights2" onclick="">Our Story</h4>
+                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
               </div>
               <div class="spacer"></div>
               <div class="header0__rect5"></div>
               <div class="spacer1"></div>
-              <div class="search-bar input-group">
-                <input placeholder="Search" name="search-bar">
-              </div>
               <div class="cell2">
                 <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" />
+                  class="header0__image10" onclick="alert(`It is clickable`)" />
               </div>
               <div class="spacer2"></div>
               <div class="cell3">
@@ -61,7 +95,7 @@ <h4 class="header0__highlights2" onclick="">Our Story</h4>
               <div class="spacer2"></div>
               <div class="cell2">
                 <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="" />
+                  class="header0__icon" onclick="alert(`It is clickable`)" />
               </div>
             </div>
           </div>
@@ -168,7 +202,7 @@ <h5 class="section1__highlights13">+</h5>
                   </div>
                 </div>
                 <hr size="1" class="section1__line" />
-                <div class="section1__content_box7" onclick="">
+                <div class="section1__content_box7" onclick="alert(`It is clickable`)">
                   <h4 class="section1__highlights4">UPDATE CART</h4>
                 </div>
                 <div class="section1__flexRow8">
@@ -178,7 +212,7 @@ <h4 class="section1__highlights4">UPDATE CART</h4>
                     </div>
                   </div>
                   <div class="spacer"></div>
-                  <div class="section1__content_box6" onclick="">
+                  <div class="section1__content_box6" onclick="alert(`It is clickable`)">
                     <h4 class="section1__highlights21">APPLY COUPON</h4>
                     <!-- Check with the DB if the coupon is valid -->
                   </div>
@@ -236,7 +270,7 @@ <h5 class="section1__highlights51">
                       <hr size="1" class="section1__line2" />
                       <div class="section1__info3">POST CODE / ZIP</div>
                       <hr size="1" class="section1__line2" />
-                      <div class="section1__content_box3" onclick="">
+                      <div class="section1__content_box3" onclick="alert(`It is clickable`)">
                         <h4 class="section1__highlights41">UPDATE TOTALS</h4>
                       </div>
                     </div>
@@ -269,11 +303,11 @@ <h4 class="section1__highlights22">
           <div class="footer__nullContent">
             <div class="footer__flexCol">
               <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="">CONTACT</h5>
+                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
                 <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="">TERMS OF SERVICES</h5>
+                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
                 <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="">SHIPPING AND RETURNS</h5>
+                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
               </div>
               <h5 class="footer__highlights_box">
                 <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
@@ -284,7 +318,6 @@ <h5 class="footer__highlights_box">
             </div>
             <div class="spacer"></div>
             <div class="footer__flexCol1">
-              <br>
               <div class="footer__flexCol2">
                 <div class="footer__group1">
                   <div class="footer__highlights13">
@@ -293,8 +326,78 @@ <h5 class="footer__highlights_box">
                   </div>
                   <div class="footer__image-container">
                     <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                      alt="A clickable arrow to submit email" class="footer__image1" onclick="" />
+                      alt="A clickable arrow to submit email" class="footer__image1"
+                      onclick="alert(`It is clickable`)" />
                     <!-- Send an email with newsletter -->
+                        <hr size="1" class="section1__line2" />
+                        <div class="section1__info3">POST CODE / ZIP</div>
+                        <hr size="1" class="section1__line2" />
+                        <div
+                          class="section1__content_box3"
+                          onclick="alert(`It is clickable`)"
+                        >
+                          <h4 class="section1__highlights41">UPDATE TOTALS</h4>
+                        </div>
+                      </div>
+                      <hr size="1" class="section1__line11" />
+                      <div class="section1__flexRow11">
+                        <h5 class="section1__highlights31">TOTAL</h5>
+                        <div class="spacer"></div>
+                        <h5 class="section1__highlights32">$380</h5>
+                      </div>
+                    </div>
+                    <div
+                      class="section1__content_box4"
+                      onclick="alert(`It is clickable`)"
+                    >
+                      <h4 class="section1__highlights22">
+                        PROCEED TO CHECKOUT
+                      </h4>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </section>
+        <!-- ======= End section1 ======= -->
+      </div>
+      <div class="section2">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
+                  </div>
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
+                <div class="spacer"></div>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
                 </div>
                 <br><br>
@@ -308,10 +411,9 @@ <h5 class="footer__highlights_box">
       </section>
     </div>
   </main>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-
   <script type="text/javascript">
     AOS.init();
+
     const header = document.querySelector("#header");
     if (header) {
       const headroom = new Headroom(header);
diff --git a/src/views/layouts/Checkout/Checkout.css b/src/views/layouts/Checkout/Checkout.css
index fef6d63..a92632d 100644
--- a/src/views/layouts/Checkout/Checkout.css
+++ b/src/views/layouts/Checkout/Checkout.css
@@ -6,13 +6,11 @@
   position: relative;
   overflow: hidden;
 }
-
-.checkout .main>.cell {
+.checkout .main > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .checkout .section1__section1 {
   display: flex;
   flex-direction: column;
@@ -20,7 +18,6 @@
   flex-grow: 1;
   min-height: 1720px;
 }
-
 .checkout .section1__flexCol {
   display: flex;
   flex-direction: column;
@@ -29,7 +26,6 @@
   flex-grow: 1;
   margin: 180px 3.71% 254px 8.33%;
 }
-
 .checkout .section1__title {
   display: flex;
   justify-content: center;
@@ -41,27 +37,23 @@
   position: relative;
   margin: 0px auto;
 }
-
 .checkout .section1__flexRow {
   display: flex;
   align-items: center;
   position: relative;
   margin: 69px 0px 0px;
 }
-
 .checkout .section1__flexCol1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 756px;
 }
-
 .checkout .section1__flexCol2 {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .checkout .section1__flexCol3 {
   display: flex;
   flex-direction: column;
@@ -69,39 +61,33 @@
   position: relative;
   margin: 0px 39.15% 0px 0%;
 }
-
 .checkout .section1__highlights1_box {
   position: relative;
   margin: 15px 0px 0px;
 }
-
 .checkout .section1__highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
 }
-
 .checkout .section1__highlights1_span0 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .checkout .section1__highlights1_span1 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .checkout .section1__rect4 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 23px 0px 0px;
 }
-
 .checkout .section1__rect41 {
   outline: 1px solid rgb(216, 216, 216);
   outline-offset: -1px;
@@ -110,14 +96,12 @@
   min-height: 187px;
   margin: 0px 12px 0px 0px;
 }
-
-.checkout .section1__flexCol2>.cell {
+.checkout .section1__flexCol2 > .cell {
   margin-top: -162px;
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .checkout .section1__flexCol4 {
   display: flex;
   flex-direction: column;
@@ -126,21 +110,18 @@
   flex-grow: 1;
   margin: 0px 5.69% 0px 4.1%;
 }
-
 .checkout .section1__highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
   letter-spacing: 0px;
   position: relative;
 }
-
 .checkout .section1__flexRow1 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 39px 0px 0px;
 }
-
 .checkout .section1__flexCol5 {
   display: flex;
   flex-direction: column;
@@ -148,25 +129,21 @@
   flex: 0 1 431px;
   margin: 13px 0px 0px;
 }
-
 .checkout .section1__desc {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
   letter-spacing: 0px;
   position: relative;
 }
-
 .checkout .section1__line4 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 22px 0px 0px;
 }
-
-.checkout .section1__flexRow1>.spacer {
+.checkout .section1__flexRow1 > .spacer {
   flex: 0 1 35px;
 }
-
 .checkout .section1__content_box {
   display: flex;
   flex-direction: column;
@@ -178,7 +155,6 @@
   flex: 0 1 216px;
   margin: 0px 0px 1px;
 }
-
 .checkout .section1__highlights4 {
   display: flex;
   justify-content: center;
@@ -190,59 +166,50 @@
   flex-grow: 1;
   margin: 16px 40px 16px 39px;
 }
-
 .checkout .section1__flexCol6 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 80px 5px 0px 0px;
 }
-
 .checkout .section1__medium_title {
   font: 400 26px/1.34 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 .checkout .section1__flexCol7 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 28px 0px 0px;
 }
-
 .checkout .section1__flexRow2 {
   display: flex;
   align-items: center;
   position: relative;
 }
-
 .checkout .section1__flexCol8 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 346px;
 }
-
 .checkout .section1__line {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 12px 0px 0px;
 }
-
-.checkout .section1__flexRow2>.spacer {
+.checkout .section1__flexRow2 > .spacer {
   flex: 0 1 58px;
 }
-
 .checkout .section1__flexCol9 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 347px;
 }
-
 .checkout .section1__highlights2 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -250,28 +217,24 @@
   position: relative;
   margin: 0px 1px;
 }
-
 .checkout .section1__line1 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 12px 0px 0px;
 }
-
 .checkout .section1__flexCol10 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 38px 7px 0px 0px;
 }
-
 .checkout .section1__line2 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 12px 0px 0px;
 }
-
 .checkout .section1__highlights3 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -280,18 +243,15 @@
   flex: 0 0 auto;
   min-width: 94px;
 }
-
-.checkout .section1__flexRow2>.spacer1 {
+.checkout .section1__flexRow2 > .spacer1 {
   flex: 0 1 636px;
 }
-
-.checkout .section1__flexRow2>.cell {
+.checkout .section1__flexRow2 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 14px;
 }
-
 .checkout .section1__image {
   width: 14px;
   height: auto;
@@ -303,7 +263,6 @@
   min-width: 14px;
   margin: 12px 0px 9px;
 }
-
 .checkout .section1__flexCol11 {
   display: flex;
   flex-direction: column;
@@ -311,14 +270,12 @@
   position: relative;
   margin: 37px 61.12% 0px 0%;
 }
-
 .checkout .section1__flexRow3 {
   display: flex;
   align-items: center;
   column-gap: 10px;
   position: relative;
 }
-
 .checkout .section1__rect1 {
   border-radius: 2px 2px 2px 2px;
   outline: 1px solid rgb(112, 112, 112);
@@ -328,7 +285,6 @@
   min-height: 17px;
   margin: 5px 0px 6px;
 }
-
 .checkout .section1__highlights11 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -337,7 +293,6 @@
   flex: 0 0 auto;
   min-width: 187px;
 }
-
 .checkout .section1__flexRow4 {
   display: flex;
   align-items: center;
@@ -345,7 +300,6 @@
   position: relative;
   margin: 19px 0px 0px;
 }
-
 .checkout .section1__rect {
   border-radius: 2px 2px 2px 2px;
   outline: 1px solid rgb(112, 112, 112);
@@ -355,7 +309,6 @@
   min-height: 16px;
   margin: 5px 0px 6px;
 }
-
 .checkout .section1__highlights12 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -364,25 +317,21 @@
   flex: 0 0 auto;
   min-width: 261px;
 }
-
 .checkout .section1__flexCol12 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 39px 7px 0px 0px;
 }
-
 .checkout .section1__line21 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 11px 0px 0px;
 }
-
-.checkout .section1__flexRow>.spacer {
+.checkout .section1__flexRow > .spacer {
   flex: 1 1 188.8px;
 }
-
 .checkout .section1__flexCol13 {
   display: flex;
   flex-direction: column;
@@ -390,14 +339,12 @@
   flex: 0 1 744px;
   margin: 95.67px 0px 137.33px;
 }
-
 .checkout .section1__medium_title1 {
   font: 400 26px/0.96 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 .checkout .section1__content_box2 {
   display: flex;
   flex-direction: column;
@@ -405,7 +352,6 @@
   position: relative;
   margin: 40px 0px 0px;
 }
-
 .checkout .section1__flexCol14 {
   display: flex;
   flex-direction: column;
@@ -414,14 +360,12 @@
   flex-grow: 1;
   margin: 40px auto 50px;
 }
-
 .checkout .section1__flexRow5 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 0px 0px 0px 3px;
 }
-
 .checkout .section1__highlights13 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -430,11 +374,9 @@
   flex: 0 0 auto;
   min-width: 95px;
 }
-
-.checkout .section1__flexRow5>.spacer {
+.checkout .section1__flexRow5 > .spacer {
   flex: 0 1 454px;
 }
-
 .checkout .section1__highlights14 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -444,21 +386,18 @@
   min-width: 48px;
   margin: 0px 0px 1px;
 }
-
 .checkout .section1__line3 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 18px 5px 0px 3px;
 }
-
 .checkout .section1__flexRow6 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 30px 1px 0px 2px;
 }
-
 .checkout .section1__highlights21 {
   font: 400 16px/1.62 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -468,11 +407,9 @@
   min-width: 44px;
   margin: 1px 0px 0px;
 }
-
-.checkout .section1__flexRow6>.spacer {
+.checkout .section1__flexRow6 > .spacer {
   flex: 0 1 512px;
 }
-
 .checkout .section1__highlights5 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -481,14 +418,12 @@
   flex: 0 0 auto;
   min-width: 41px;
 }
-
 .checkout .section1__flexRow7 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 21px 0px 0px;
 }
-
 .checkout .section1__highlights22 {
   font: 400 16px/1.62 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -497,11 +432,9 @@
   flex: 0 0 auto;
   min-width: 134px;
 }
-
-.checkout .section1__flexRow7>.spacer {
+.checkout .section1__flexRow7 > .spacer {
   flex: 0 1 433px;
 }
-
 .checkout .section1__highlights6 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -510,14 +443,12 @@
   flex: 0 0 auto;
   min-width: 30px;
 }
-
 .checkout .section1__flexRow8 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 26px 3px 0px;
 }
-
 .checkout .section1__highlights23 {
   font: 400 16px/1.62 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -526,11 +457,9 @@
   flex: 0 0 auto;
   min-width: 123px;
 }
-
-.checkout .section1__flexRow8>.spacer {
+.checkout .section1__flexRow8 > .spacer {
   flex: 0 1 444px;
 }
-
 .checkout .section1__highlights7 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -539,21 +468,18 @@
   flex: 0 0 auto;
   min-width: 26px;
 }
-
 .checkout .section1__line31 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 13px 5px 0px 3px;
 }
-
 .checkout .section1__flexRow9 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 16px 3px 0px;
 }
-
 .checkout .section1__highlights15 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -562,18 +488,15 @@
   flex: 0 0 auto;
   min-width: 99px;
 }
-
-.checkout .section1__flexRow9>.spacer {
+.checkout .section1__flexRow9 > .spacer {
   flex: 0 1 454px;
 }
-
 .checkout .section1__line32 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 10px 5px 0px 3px;
 }
-
 .checkout .section1__highlights16 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -582,11 +505,9 @@
   flex: 0 0 auto;
   min-width: 90px;
 }
-
-.checkout .section1__flexRow9>.spacer1 {
+.checkout .section1__flexRow9 > .spacer1 {
   flex: 0 1 403px;
 }
-
 .checkout .section1__highlights8 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -595,21 +516,18 @@
   flex: 0 0 auto;
   min-width: 100px;
 }
-
 .checkout .section1__line33 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 14px 4px 0px;
 }
-
 .checkout .section1__flexRow10 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 20px 3px 0px;
 }
-
 .checkout .section1__highlights31 {
   font: 700 16px/1.31 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -618,11 +536,9 @@
   flex: 0 0 auto;
   min-width: 64px;
 }
-
-.checkout .section1__flexRow10>.spacer {
+.checkout .section1__flexRow10 > .spacer {
   flex: 0 1 485px;
 }
-
 .checkout .section1__highlights32 {
   font: 700 16px/1.31 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -631,21 +547,18 @@
   flex: 0 0 auto;
   min-width: 43px;
 }
-
 .checkout .section1__flexCol15 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 63px 5px 0px 3px;
 }
-
-.checkout .section1__flexRow3>.cell {
+.checkout .section1__flexRow3 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 21px;
 }
-
 .checkout .section1__image1 {
   width: 21px;
   height: auto;
@@ -657,7 +570,6 @@
   min-width: 21px;
   margin: 7px 0px 5px;
 }
-
 .checkout .section1__highlights17 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -666,7 +578,6 @@
   flex: 0 0 auto;
   min-width: 188px;
 }
-
 .checkout .section1__desc1 {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -674,7 +585,6 @@
   position: relative;
   margin: 20px 0px 0px;
 }
-
 .checkout .section1__flexRow11 {
   display: flex;
   align-items: center;
@@ -682,14 +592,12 @@
   position: relative;
   margin: 21px 0px 0px;
 }
-
-.checkout .section1__flexRow11>.cell {
+.checkout .section1__flexRow11 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 21px;
 }
-
 .checkout .section1__highlights18 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -698,14 +606,12 @@
   flex: 0 0 auto;
   min-width: 161px;
 }
-
-.checkout .section1__flexRow4>.cell {
+.checkout .section1__flexRow4 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 21px;
 }
-
 .checkout .section1__image2 {
   width: 21px;
   height: auto;
@@ -717,7 +623,6 @@
   min-width: 21px;
   margin: 6px 0px 5px;
 }
-
 .checkout .section1__highlights19 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -726,7 +631,6 @@
   flex: 0 0 auto;
   min-width: 158px;
 }
-
 .checkout .section1__flexRow12 {
   display: flex;
   align-items: center;
@@ -734,14 +638,12 @@
   position: relative;
   margin: 18px 0px 0px;
 }
-
-.checkout .section1__flexRow12>.cell {
+.checkout .section1__flexRow12 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 21px;
 }
-
 .checkout .section1__highlights110 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -750,14 +652,12 @@
   flex: 0 0 auto;
   min-width: 61px;
 }
-
-.checkout .section1__flexRow12>.cell1 {
+.checkout .section1__flexRow12 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 16px;
 }
-
 .checkout .section1__icon {
   width: 16px;
   height: auto;
@@ -769,7 +669,6 @@
   min-width: 16px;
   margin: 8px 0px 4px;
 }
-
 .checkout .section1__content_box1 {
   display: flex;
   flex-direction: column;
@@ -780,7 +679,6 @@
   position: relative;
   margin: 47px 5px 0px 3px;
 }
-
 .checkout .section1__highlights41 {
   display: flex;
   justify-content: center;
@@ -794,7 +692,6 @@
   min-width: 121px;
   margin: 15px auto 16px;
 }
-
 .checkout .section2 {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/Checkout/Checkout.html b/src/views/layouts/Checkout/Checkout.html
index 60cdfd4..573f3b4 100644
--- a/src/views/layouts/Checkout/Checkout.html
+++ b/src/views/layouts/Checkout/Checkout.html
@@ -1,337 +1,393 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <!-- Font Awesome is an icon library -->
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
-  <!-- 'Animate On Scroll' library -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <!-- Bootstrap linker -->
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\Checkout\Checkout.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
 
-  <link rel="stylesheet" type="text/css" href="/src/views/layouts/Checkout/Checkout.css" />
-  <link rel="stylesheet" type="text/css" href="/src/views/partials/Header/Header0.css" />
-  <link rel="stylesheet" type="text/css" href="/src/views/partials/Footer/Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-</head>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+  </head>
 
-<body class="flex-column">
-  <header id="header" class="headroom">
-    <nav class="max:show">
-      <!-- prettier-ignore -->
-      <div class="header0 header0__group1">
-        <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
-          <div class="spacer"></div>
-          <div class="header0__box">
-            <div class="header0__flexRow1">
-              <div class="cell">
-                <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr">
-                  <div class="header0__txt" onclick="window.location.href='/src/views/layouts/ShopPage/ShopPage.html'">
-                    Shop</div>
-                </px-grid>
-              </div>
-              <div class="cell1">
-                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
-              </div>
+  <body class="flex-column">
+    <header id="header" class="headroom">
+      <nav class="max:show">
+        <!-- prettier-ignore -->
+        <div class="header0 header0__group1">
+            <div class="header0__flexRow">
+              <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
               <div class="spacer"></div>
-              <div class="header0__rect5"></div>
-              <div class="spacer1"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" onclick="alert(`It is clickable`)" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell3">
-                <img src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png" alt="alt text"
-                  class="header0__icon1" onclick="window.location.href='/src/views/layouts/Cart/Cart.html'" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="alert(`It is clickable`)" />
+              <div class="header0__box">
+                <div class="header0__flexRow1">
+                  <div class="cell">
+                    <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr"
+                      ><div class="header0__txt" onclick="window.location.href = 'ShopPage.html'">Shop</div></px-grid
+                    >
+                  </div>
+                  <div class="cell1"><h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4></div>
+                  <div class="spacer"></div>
+                  <div class="header0__rect5"></div>
+                  <div class="spacer1"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png"
+                      alt="alt text"
+                      class="header0__image10"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell3">
+                    <img
+                      src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png"
+                      alt="alt text"
+                      class="header0__icon1"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png"
+                      alt="alt text"
+                      class="header0__icon"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-      </div>
-    </nav>
-  </header>
-
-  <main class="checkout main">
-    <div class="cell">
-      <!-- ======= section1 ======= -->
-      <section class="section1__section1">
-        <div class="section1__flexCol">
-          <h1 class="section1__title">Checkout</h1>
-          <div class="section1__flexRow">
-            <div class="section1__flexCol1">
-              <div class="section1__flexCol2">
-                <div class="section1__flexCol3">
-                  <h5 class="section1__highlights1_box">
-                    <span class="section1__highlights1"><span class="section1__highlights1_span0">Returning customer?
-                      </span><span class="section1__highlights1_span1">Click here to login</span></span>
-                  </h5>
-                  <h5 class="section1__highlights1_box">
-                    <span class="section1__highlights1"><span class="section1__highlights1_span0">Have a coupon?
-                      </span><span class="section1__highlights1_span1">Click here to enter your code</span></span>
-                  </h5>
-                </div>
-                <div class="section1__rect4">
-                  <div class="section1__rect41"></div>
-                </div>
-                <div class="cell">
-                  <div class="section1__flexCol4">
-                    <h5 class="section1__highlights">
-                      If you have a coupon code, please apply it below.
+      </nav>
+    </header>
+    <main class="checkout main">
+      <div class="cell">
+        <!-- ======= section1 ======= -->
+        <section class="section1__section1">
+          <div class="section1__flexCol">
+            <h1 class="section1__title">Checkout</h1>
+            <div class="section1__flexRow">
+              <div class="section1__flexCol1">
+                <div class="section1__flexCol2">
+                  <div class="section1__flexCol3">
+                    <h5 class="section1__highlights1_box">
+                      <span class="section1__highlights1"
+                        ><span class="section1__highlights1_span0"
+                          >Returning customer? </span
+                        ><span class="section1__highlights1_span1"
+                          >Click here to login</span
+                        ></span
+                      >
                     </h5>
-                    <div class="section1__flexRow1">
-                      <div class="section1__flexCol5">
-                        <div class="section1__desc">Coupon Code</div>
-                        <hr size="1" class="section1__line4" />
-                      </div>
-                      <div class="spacer"></div>
-                      <div class="section1__content_box">
-                        <h4 class="section1__highlights4">APPLY COUPON</h4>
+                    <h5 class="section1__highlights1_box">
+                      <span class="section1__highlights1"
+                        ><span class="section1__highlights1_span0"
+                          >Have a coupon? </span
+                        ><span class="section1__highlights1_span1"
+                          >Click here to enter your code</span
+                        ></span
+                      >
+                    </h5>
+                  </div>
+                  <div class="section1__rect4">
+                    <div class="section1__rect41"></div>
+                  </div>
+                  <div class="cell">
+                    <div class="section1__flexCol4">
+                      <h5 class="section1__highlights">
+                        If you have a coupon code, please apply it below.
+                      </h5>
+                      <div class="section1__flexRow1">
+                        <div class="section1__flexCol5">
+                          <div class="section1__desc">Coupon Code</div>
+                          <hr size="1" class="section1__line4" />
+                        </div>
+                        <div class="spacer"></div>
+                        <div class="section1__content_box">
+                          <h4 class="section1__highlights4">APPLY COUPON</h4>
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
-              </div>
-              <div class="section1__flexCol6">
-                <h2 class="section1__medium_title">Billing Details</h2>
-                <div class="section1__flexCol7">
-                  <div class="section1__flexRow2">
-                    <div class="section1__flexCol8">
-                      <h5 class="section1__highlights">First name *</h5>
-                      <hr size="1" class="section1__line" />
+                <div class="section1__flexCol6">
+                  <h2 class="section1__medium_title">Billing Details</h2>
+                  <div class="section1__flexCol7">
+                    <div class="section1__flexRow2">
+                      <div class="section1__flexCol8">
+                        <h5 class="section1__highlights">First name *</h5>
+                        <hr size="1" class="section1__line" />
+                      </div>
+                      <div class="spacer"></div>
+                      <div class="section1__flexCol9">
+                        <h5 class="section1__highlights2">Last name *</h5>
+                        <hr size="1" class="section1__line1" />
+                      </div>
                     </div>
-                    <div class="spacer"></div>
-                    <div class="section1__flexCol9">
-                      <h5 class="section1__highlights2">Last name *</h5>
-                      <hr size="1" class="section1__line1" />
+                    <div class="section1__flexCol10">
+                      <h5 class="section1__highlights">Company Name</h5>
+                      <hr size="1" class="section1__line2" />
                     </div>
-                  </div>
-                  <div class="section1__flexCol10">
-                    <h5 class="section1__highlights">Company Name</h5>
-                    <hr size="1" class="section1__line2" />
-                  </div>
-                  <div class="section1__flexCol10">
-                    <div class="section1__flexRow2">
-                      <h5 class="section1__highlights3">Country *</h5>
-                      <div class="spacer1"></div>
-                      <div class="cell">
-                        <img src="\src\views\partials\assets\fe83417045ca8840c041a05c15c0f6d3.png" alt="alt text"
-                          class="section1__image" />
+                    <div class="section1__flexCol10">
+                      <div class="section1__flexRow2">
+                        <h5 class="section1__highlights3">Country *</h5>
+                        <div class="spacer1"></div>
+                        <div class="cell">
+                          <img
+                            src="\src\views\partials\assets\fe83417045ca8840c041a05c15c0f6d3.png"
+                            alt="alt text"
+                            class="section1__image"
+                          />
+                        </div>
                       </div>
+                      <hr size="1" class="section1__line2" />
                     </div>
-                    <hr size="1" class="section1__line2" />
-                  </div>
-                  <div class="section1__flexCol10">
-                    <h5 class="section1__highlights">Street Address *</h5>
-                    <hr size="1" class="section1__line2" />
-                  </div>
-                  <div class="section1__flexCol10">
-                    <h5 class="section1__highlights">Postcode / ZIP *</h5>
-                    <hr size="1" class="section1__line2" />
-                  </div>
-                  <div class="section1__flexCol10">
-                    <h5 class="section1__highlights">Town / City *</h5>
-                    <hr size="1" class="section1__line2" />
-                  </div>
-                  <div class="section1__flexCol10">
-                    <h5 class="section1__highlights">Phone *</h5>
-                    <hr size="1" class="section1__line2" />
-                  </div>
-                  <div class="section1__flexCol10">
-                    <h5 class="section1__highlights">Email *</h5>
-                    <hr size="1" class="section1__line2" />
-                  </div>
-                  <div class="section1__flexCol11">
-                    <div class="section1__flexRow3">
-                      <div class="section1__rect1"></div>
-                      <h5 class="section1__highlights11">
-                        Create an acoount?
-                      </h5>
+                    <div class="section1__flexCol10">
+                      <h5 class="section1__highlights">Street Address *</h5>
+                      <hr size="1" class="section1__line2" />
                     </div>
-                    <div class="section1__flexRow4">
-                      <div class="section1__rect"></div>
-                      <h5 class="section1__highlights12">
-                        Ship to a different address?
-                      </h5>
+                    <div class="section1__flexCol10">
+                      <h5 class="section1__highlights">Postcode / ZIP *</h5>
+                      <hr size="1" class="section1__line2" />
+                    </div>
+                    <div class="section1__flexCol10">
+                      <h5 class="section1__highlights">Town / City *</h5>
+                      <hr size="1" class="section1__line2" />
+                    </div>
+                    <div class="section1__flexCol10">
+                      <h5 class="section1__highlights">Phone *</h5>
+                      <hr size="1" class="section1__line2" />
+                    </div>
+                    <div class="section1__flexCol10">
+                      <h5 class="section1__highlights">Email *</h5>
+                      <hr size="1" class="section1__line2" />
+                    </div>
+                    <div class="section1__flexCol11">
+                      <div class="section1__flexRow3">
+                        <div class="section1__rect1"></div>
+                        <h5 class="section1__highlights11">
+                          Create an acoount?
+                        </h5>
+                      </div>
+                      <div class="section1__flexRow4">
+                        <div class="section1__rect"></div>
+                        <h5 class="section1__highlights12">
+                          Ship to a different address?
+                        </h5>
+                      </div>
+                    </div>
+                    <div class="section1__flexCol12">
+                      <h5 class="section1__highlights">Order notes</h5>
+                      <hr size="1" class="section1__line21" />
                     </div>
-                  </div>
-                  <div class="section1__flexCol12">
-                    <h5 class="section1__highlights">Order notes</h5>
-                    <hr size="1" class="section1__line21" />
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="spacer"></div>
-            <div class="section1__flexCol13">
-              <h2 class="section1__medium_title1">YOUR ORDER</h2>
-              <div class="section1__content_box2">
-                <div class="section1__flexCol14">
-                  <div class="section1__flexRow5">
-                    <h5 class="section1__highlights13">PRODUCT</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights14">TOTAL</h5>
-                  </div>
-                  <hr size="1" class="section1__line3" />
-                  <div class="section1__flexRow6">
-                    <h5 class="section1__highlights21">CitiZ</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights5">$350</h5>
-                  </div>
-                  <div class="section1__flexRow7">
-                    <h5 class="section1__highlights22">BARISTA Cups</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights6">$20</h5>
-                  </div>
-                  <div class="section1__flexRow8">
-                    <h5 class="section1__highlights23">ORIGIN Cups</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights7">$10</h5>
-                  </div>
-                  <hr size="1" class="section1__line31" />
-                  <div class="section1__flexRow9">
-                    <h5 class="section1__highlights15">SUBTOTAL</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights5">$380</h5>
-                  </div>
-                  <hr size="1" class="section1__line32" />
-                  <div class="section1__flexRow9">
-                    <h5 class="section1__highlights16">SHIPPING</h5>
-                    <div class="spacer1"></div>
-                    <h5 class="section1__highlights8">Free shipping</h5>
-                  </div>
-                  <hr size="1" class="section1__line33" />
-                  <div class="section1__flexRow10">
-                    <h5 class="section1__highlights31">TOTAL</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights32">$380</h5>
-                  </div>
-                  <div class="section1__flexCol15">
-                    <div class="section1__flexRow3">
-                      <div class="cell">
-                        <img src="\src\views\partials\assets\5533d6f4de7c376b41676bc5b5edbeed.png" alt="alt text"
-                          class="section1__image1" />
-                      </div>
-                      <h5 class="section1__highlights17">
-                        Direct bank transfer
-                      </h5>
+              <div class="spacer"></div>
+              <div class="section1__flexCol13">
+                <h2 class="section1__medium_title1">YOUR ORDER</h2>
+                <div class="section1__content_box2">
+                  <div class="section1__flexCol14">
+                    <div class="section1__flexRow5">
+                      <h5 class="section1__highlights13">PRODUCT</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights14">TOTAL</h5>
                     </div>
-                    <p class="section1__desc1">
-                      Make your payment directly into our bank account. Please
-                      use your Order ID as the payment reference. Your order
-                      will not be shipped until the funds have cleared in our
-                      account
-                    </p>
-                    <div class="section1__flexRow11">
-                      <div class="cell">
-                        <img src="\src\views\partials\assets\9a9eda9a730f969396cdebea15c94dd7.png" alt="alt text"
-                          class="section1__image1" />
-                      </div>
-                      <h5 class="section1__highlights18">Check payments</h5>
+                    <hr size="1" class="section1__line3" />
+                    <div class="section1__flexRow6">
+                      <h5 class="section1__highlights21">CitiZ</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights5">$350</h5>
                     </div>
-                    <div class="section1__flexRow4">
-                      <div class="cell">
-                        <img src="\src\views\partials\assets\9a9eda9a730f969396cdebea15c94dd7.png" alt="alt text"
-                          class="section1__image2" />
-                      </div>
-                      <h5 class="section1__highlights19">Cash on delivery</h5>
+                    <div class="section1__flexRow7">
+                      <h5 class="section1__highlights22">BARISTA Cups</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights6">$20</h5>
+                    </div>
+                    <div class="section1__flexRow8">
+                      <h5 class="section1__highlights23">ORIGIN Cups</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights7">$10</h5>
                     </div>
-                    <div class="section1__flexRow12">
-                      <div class="cell">
-                        <img src="\src\views\partials\assets\9a9eda9a730f969396cdebea15c94dd7.png" alt="alt text"
-                          class="section1__image1" />
+                    <hr size="1" class="section1__line31" />
+                    <div class="section1__flexRow9">
+                      <h5 class="section1__highlights15">SUBTOTAL</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights5">$380</h5>
+                    </div>
+                    <hr size="1" class="section1__line32" />
+                    <div class="section1__flexRow9">
+                      <h5 class="section1__highlights16">SHIPPING</h5>
+                      <div class="spacer1"></div>
+                      <h5 class="section1__highlights8">Free shipping</h5>
+                    </div>
+                    <hr size="1" class="section1__line33" />
+                    <div class="section1__flexRow10">
+                      <h5 class="section1__highlights31">TOTAL</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights32">$380</h5>
+                    </div>
+                    <div class="section1__flexCol15">
+                      <div class="section1__flexRow3">
+                        <div class="cell">
+                          <img
+                            src="\src\views\partials\assets\5533d6f4de7c376b41676bc5b5edbeed.png"
+                            alt="alt text"
+                            class="section1__image1"
+                          />
+                        </div>
+                        <h5 class="section1__highlights17">
+                          Direct bank transfer
+                        </h5>
                       </div>
-                      <h5 class="section1__highlights110">PayPal</h5>
-                      <div class="cell1">
-                        <img src="\src\views\partials\assets\9a4a8757fe35d2fe39d10607794c9ff4.png" alt="alt text"
-                          class="section1__icon" />
+                      <p class="section1__desc1">
+                        Make your payment directly into our bank account. Please
+                        use your Order ID as the payment reference. Your order
+                        will not be shipped until the funds have cleared in our
+                        account
+                      </p>
+                      <div class="section1__flexRow11">
+                        <div class="cell">
+                          <img
+                            src="\src\views\partials\assets\9a9eda9a730f969396cdebea15c94dd7.png"
+                            alt="alt text"
+                            class="section1__image1"
+                          />
+                        </div>
+                        <h5 class="section1__highlights18">Check payments</h5>
+                      </div>
+                      <div class="section1__flexRow4">
+                        <div class="cell">
+                          <img
+                            src="\src\views\partials\assets\9a9eda9a730f969396cdebea15c94dd7.png"
+                            alt="alt text"
+                            class="section1__image2"
+                          />
+                        </div>
+                        <h5 class="section1__highlights19">Cash on delivery</h5>
+                      </div>
+                      <div class="section1__flexRow12">
+                        <div class="cell">
+                          <img
+                            src="\src\views\partials\assets\9a9eda9a730f969396cdebea15c94dd7.png"
+                            alt="alt text"
+                            class="section1__image1"
+                          />
+                        </div>
+                        <h5 class="section1__highlights110">PayPal</h5>
+                        <div class="cell1">
+                          <img
+                            src="\src\views\partials\assets\9a4a8757fe35d2fe39d10607794c9ff4.png"
+                            alt="alt text"
+                            class="section1__icon"
+                          />
+                        </div>
                       </div>
                     </div>
-                  </div>
-                  <div class="section1__content_box1"
-                    onclick="window.location.href='/src/views/layouts/ViewOrder/ViewOrder.html'">
-                    <h4 class="section1__highlights41">PLACE ORDER</h4>
+                    <div class="section1__content_box1">
+                      <h4 class="section1__highlights41">PLACE ORDER</h4>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
-      </section>
-      <!-- ======= End section1 ======= -->
-    </div>
-    <div class="section2">
-      <!-- prettier-ignore -->
-      <section class="footer footer__section2">
-        <hr size="1" class="footer__line" />
-        <div class="footer__group">
-          <div class="footer__nullContent">
-            <div class="footer__flexCol">
-              <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
-                <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
-              </div>
-              <h5 class="footer__highlights_box">
-                <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                    class="footer__highlights_span1"> Terms of use </span><span
-                    class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                    policy.</span></span>
-              </h5>
-            </div>
-            <div class="spacer"></div>
-            <div class="footer__flexCol1">
-              <br>
-              <div class="footer__flexCol2">
-                <div class="footer__group1">
-                  <div class="footer__highlights13">
-                    <input class="form-control email-input" type="text"
-                      placeholder="Enter your email, get the newsletter!">
+        </section>
+        <!-- ======= End section1 ======= -->
+      </div>
+      <div class="section2">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
                   </div>
-                  <div class="footer__image-container">
-                    <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                      alt="A clickable arrow to submit email" class="footer__image1"
-                      onclick="alert(`It is clickable`)" />
-                    <!-- Send an email with newsletter -->
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
+                <div class="spacer"></div>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
                 </div>
-                <br><br>
-                <hr size="1" class="footer__line1" />
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-          </div>
-          <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-            class="footer__image2" />
-        </div>
-      </section>
-    </div>
-  </main>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-
-  <script type="text/javascript">
-    AOS.init();
-    const header = document.querySelector("#header");
-    if (header) {
-      const headroom = new Headroom(header);
-      headroom.init();
-    }
-  </script>
-</body>
+          </section>
+      </div>
+    </main>
+    <script type="text/javascript">
+      AOS.init();
 
-</html>
\ No newline at end of file
+      const header = document.querySelector("#header");
+      if (header) {
+        const headroom = new Headroom(header);
+        headroom.init();
+      }
+    </script>
+  </body>
+</html>
diff --git a/src/views/layouts/HomePage/HomePage.css b/src/views/layouts/HomePage/HomePage.css
index 7e38c18..cdc7431 100644
--- a/src/views/layouts/HomePage/HomePage.css
+++ b/src/views/layouts/HomePage/HomePage.css
@@ -6,13 +6,11 @@
   position: relative;
   overflow: hidden;
 }
-
-.home-page .main>.cell {
+.home-page .main > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .home-page .section1__section1 {
   display: flex;
   flex-direction: column;
@@ -20,7 +18,6 @@
   flex-grow: 1;
   min-height: 1176px;
 }
-
 .home-page .section1__group {
   display: flex;
   flex-direction: column;
@@ -28,41 +25,35 @@
   flex-grow: 1;
   margin: 0px 0px 22px;
 }
-
 .home-page .section1__flexCol {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .home-page .section1__flexCol1 {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
-.home-page .section1__flexCol1>.cell {
+.home-page .section1__flexCol1 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 1 1 1136px;
 }
-
 .home-page .section1__rect {
   background-color: rgb(30, 13, 10);
   position: relative;
   flex-grow: 1;
   min-height: 1136px;
 }
-
-.home-page .section1__flexCol1>.cell1 {
+.home-page .section1__flexCol1 > .cell1 {
   margin-top: -13px;
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .home-page .section1__image {
   width: calc(100% - 0px);
   height: auto;
@@ -72,14 +63,12 @@
   object-position: center center;
   position: relative;
 }
-
-.home-page .section1__flexCol>.cell {
+.home-page .section1__flexCol > .cell {
   margin-top: -932px;
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .home-page .section1__group1 {
   display: flex;
   flex-direction: column;
@@ -88,7 +77,6 @@
   flex-grow: 1;
   margin: 0px 52.92% 0px 8.33%;
 }
-
 .home-page .section1__decorator {
   width: calc(100% + 1206px);
   height: auto;
@@ -102,14 +90,12 @@
   left: -175px;
   right: -1031px;
 }
-
 .home-page .section1__hero_title {
   font: 700 70px/1.5 "Poppins", Helvetica, Arial, serif;
   color: rgb(255, 255, 255);
   letter-spacing: 0px;
   position: relative;
 }
-
 .home-page .section1__medium_title {
   font: 24px/1.5 "Poppins", Helvetica, Arial, serif;
   color: rgb(255, 255, 255);
@@ -118,7 +104,6 @@
   position: relative;
   margin: 55px 15.73% 0px 0%;
 }
-
 .home-page .section1__box {
   display: flex;
   align-items: center;
@@ -130,14 +115,12 @@
   position: relative;
   margin: 134px 66.4% 0px 0%;
 }
-
-.home-page .section1__box>.cell {
+.home-page .section1__box > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 1 1 250px;
 }
-
 .home-page .section1__medium_title1 {
   display: flex;
   justify-content: center;
@@ -149,7 +132,6 @@
   flex-grow: 1;
   margin: 9px 64px 8px;
 }
-
 .home-page .section1__component {
   position: absolute;
   top: 0px;
@@ -157,7 +139,6 @@
   left: 0px;
   right: 0px;
 }
-
 .home-page .section2 {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/HomePage/HomePage.html b/src/views/layouts/HomePage/HomePage.html
index 6b66343..5d9c5a9 100644
--- a/src/views/layouts/HomePage/HomePage.html
+++ b/src/views/layouts/HomePage/HomePage.html
@@ -1,146 +1,194 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\HomePage\HomePage.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\HeaderHomePage.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
 
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+  </head>
 
-  <link rel="stylesheet" type="text/css" href="/css/common.css" />
-  <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
-  <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\layouts\HomePage\HomePage.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Header\HeaderHomePage.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Footer\Footer.css" />
-
-
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-</head>
-
-<body class="flex-column">
-  <main class="home-page main">
-    <div class="cell">
-      <!-- ======= section1 ======= -->
-      <section class="section1__section1">
-        <div class="section1__group">
-          <div class="section1__flexCol">
-            <div class="section1__flexCol1">
-              <div class="cell">
-                <div class="section1__rect"></div>
-              </div>
-              <div class="cell1">
-                <img src="\src\views\partials\assets\d772c386555967597ceee86f3c3e43c8.png" alt="alt text"
-                  class="section1__image" />
+  <body class="flex-column">
+    <main class="home-page main">
+      <div class="cell">
+        <!-- ======= section1 ======= -->
+        <section class="section1__section1">
+          <div class="section1__group">
+            <div class="section1__flexCol">
+              <div class="section1__flexCol1">
+                <div class="cell"><div class="section1__rect"></div></div>
+                <div class="cell1">
+                  <img
+                    src="\src\views\partials\assets\d772c386555967597ceee86f3c3e43c8.png"
+                    alt="alt text"
+                    class="section1__image"
+                  />
+                </div>
               </div>
-            </div>
-            <div class="cell">
-              <div class="section1__group1">
-                <img src="\src\views\partials\assets\54d627dd9c8c9cec425bd49850edc281.png" alt="alt text"
-                  class="section1__decorator" />
-                <div class="section1__flexCol">
-                  <div class="section1__flexCol1">
-                    <h1 class="section1__hero_title">Caffeinated Journey</h1>
-                    <h2 class="section1__medium_title">
-                      Explore our world of exquisite coffee.<br />Elevate your
-                      experience with captivating flavors and premium
-                      products. <br />Join us on this caffeinated journey.<br /><br />Welcome
-                      to the ultimate coffee destination.
-                    </h2>
-                  </div>
-                  <div class="section1__box" onclick="alert(`It is clickable`)">
-                    <div class="cell">
-                      <h2 class="section1__medium_title1">Shop Now</h2>
+              <div class="cell">
+                <div class="section1__group1">
+                  <img
+                    src="\src\views\partials\assets\54d627dd9c8c9cec425bd49850edc281.png"
+                    alt="alt text"
+                    class="section1__decorator"
+                  />
+                  <div class="section1__flexCol">
+                    <div class="section1__flexCol1">
+                      <h1 class="section1__hero_title">Caffeinated Journey</h1>
+                      <h2 class="section1__medium_title">
+                        Explore our world of exquisite coffee.<br />Elevate your
+                        experience with captivating flavors and premium
+                        products. <br />Join us on this caffeinated journey.<br /><br />Welcome
+                        to the ultimate coffee destination.
+                      </h2>
+                    </div>
+                    <div
+                      class="section1__box"
+                      onclick="alert(`It is clickable`)"
+                    >
+                      <div class="cell">
+                        <h2 class="section1__medium_title1">Shop Now</h2>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
+          <div class="section1__component">
+            <!-- prettier-ignore -->
+            <div class="header-home-page header-home-page__wrapper">
+    <div style="--src:url(\src\views\partials\assets\71a39aead45d185097de40b8868cc43a.png)" class="header-home-page__wrapper1">
+      <div class="header-home-page__flexRow">
+        <h2 class="header-home-page__medium_title2" onclick="alert(`It is clickable`)">Urusta.</h2>
+        <div class="spacer"></div>
+        <h4 class="header-home-page__highlights2" onclick="alert(`It is clickable`)">Shop</h4>
+        <div class="spacer1"></div>
+        <h4 class="header-home-page__highlights21" onclick="alert(`It is clickable`)">Our Story</h4>
+        <div class="spacer2"></div>
+        <div class="header-home-page__rect1"></div>
+        <div class="spacer3"></div>
+        <div class="cell">
+          <img
+            src="\src\views\partials\assets\0546d2235c8e03bac4880ef1773730f0.png"
+            alt="alt text"
+            class="header-home-page__image4"
+            onclick="alert(`It is clickable`)"
+          />
         </div>
-        <div class="section1__component">
-          <!-- prettier-ignore -->
-          <div class="header-home-page header-home-page__wrapper">
-            <div style="--src:url(\src\views\partials\assets\71a39aead45d185097de40b8868cc43a.png)"
-              class="header-home-page__wrapper1">
-              <div class="header-home-page__flexRow">
-                <h2 class="header-home-page__medium_title2" onclick="alert(`It is clickable`)">Urusta.</h2>
-                <div class="spacer"></div>
-                <h4 class="header-home-page__highlights2" onclick="alert(`It is clickable`)">Shop</h4>
-                <div class="spacer1"></div>
-                <h4 class="header-home-page__highlights21" onclick="alert(`It is clickable`)">Our Story</h4>
-                <div class="spacer2"></div>
-                <div class="header-home-page__rect1"></div>
-                <div class="spacer3"></div>
-                <div class="cell">
-                  <img src="\src\views\partials\assets\0546d2235c8e03bac4880ef1773730f0.png" alt="alt text"
-                    class="header-home-page__image4" onclick="alert(`It is clickable`)" />
-                </div>
-                <div class="spacer4"></div>
-                <div class="cell1">
-                  <img src="\src\views\partials\assets\afd90b832af44449bd9687911126f2b7.png" alt="alt text"
-                    class="header-home-page__icon1" onclick="alert(`It is clickable`)" />
-                </div>
-                <div class="spacer4"></div>
-                <div class="cell">
-                  <img src="\src\views\partials\assets\97bcccc35033c74b6a40d5f7fbb33516.png" alt="alt text"
-                    class="header-home-page__icon" onclick="alert(`It is clickable`)" />
-                </div>
-              </div>
-            </div>
-          </div>
+        <div class="spacer4"></div>
+        <div class="cell1">
+          <img
+            src="\src\views\partials\assets\afd90b832af44449bd9687911126f2b7.png"
+            alt="alt text"
+            class="header-home-page__icon1"
+            onclick="alert(`It is clickable`)"
+          />
+        </div>
+        <div class="spacer4"></div>
+        <div class="cell">
+          <img
+            src="\src\views\partials\assets\97bcccc35033c74b6a40d5f7fbb33516.png"
+            alt="alt text"
+            class="header-home-page__icon"
+            onclick="alert(`It is clickable`)"
+          />
         </div>
-      </section>
-      <!-- ======= End section1 ======= -->
+      </div>
     </div>
-    <div class="section2">
-      <!-- prettier-ignore -->
-      <section class="footer footer__section2">
-        <hr size="1" class="footer__line" />
-        <div class="footer__group">
-          <div class="footer__nullContent">
-            <div class="footer__flexCol">
-              <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+  </div>
+          </div>
+        </section>
+        <!-- ======= End section1 ======= -->
+      </div>
+      <div class="section2">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
+                  </div>
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
                 <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
-              </div>
-              <h5 class="footer__highlights_box">
-                <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                    class="footer__highlights_span1"> Terms of use </span><span
-                    class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                    policy.</span></span>
-              </h5>
-            </div>
-            <div class="spacer"></div>
-            <div class="footer__flexCol1">
-              <div class="footer__flexCol2">
-                <div class="footer__group1">
-                  <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png" alt="alt text"
-                    class="footer__image1" onclick="alert(`It is clickable`)" />
-                  <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
+                  </div>
                 </div>
-                <hr size="1" class="footer__line1" />
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-          </div>
-          <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-            class="footer__image2" />
-        </div>
-      </section>
-    </div>
-  </main>
-  <script type="text/javascript">
-    AOS.init();
-  </script>
-</body>
-
-</html>
\ No newline at end of file
+          </section>
+      </div>
+    </main>
+    <script type="text/javascript">
+      AOS.init();
+    </script>
+  </body>
+</html>
diff --git a/src/views/layouts/OurStory/OurStory.css b/src/views/layouts/OurStory/OurStory.css
index f3c7b5e..d58e2c3 100644
--- a/src/views/layouts/OurStory/OurStory.css
+++ b/src/views/layouts/OurStory/OurStory.css
@@ -6,20 +6,17 @@
   position: relative;
   overflow: hidden;
 }
-
-.our-story .main>.cell {
+.our-story .main > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .our-story .section1__section1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .our-story .section1__flexCol {
   display: flex;
   flex-direction: column;
@@ -28,37 +25,31 @@
   flex-grow: 1;
   margin: 220px auto 216px;
 }
-
 @media (max-width: 991px) {
   .our-story .section1__flexCol {
     width: 48.24%;
   }
 }
-
 @media (max-width: 767px) {
   .our-story .section1__flexCol {
     width: 55.41%;
   }
 }
-
 @media (max-width: 575px) {
   .our-story .section1__flexCol {
     width: 62.36%;
   }
 }
-
 @media (max-width: 479px) {
   .our-story .section1__flexCol {
     width: 68.84%;
   }
 }
-
 @media (max-width: 383px) {
   .our-story .section1__flexCol {
     width: 74.65%;
   }
 }
-
 .our-story .section1__title {
   display: flex;
   font: 500 33px/1.3 "DM Sans", Helvetica, Arial, serif;
@@ -68,45 +59,38 @@
   position: relative;
   margin: 0px auto;
 }
-
 @media (max-width: 2999px) {
   .our-story .section1__title {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 1199px) {
   .our-story .section1__title {
     font-size: 28px;
   }
 }
-
 @media (max-width: 991px) {
   .our-story .section1__title {
     font-size: 24px;
   }
 }
-
 @media (max-width: 767px) {
   .our-story .section1__title {
     font-size: 20px;
   }
 }
-
 @media (max-width: 383px) {
   .our-story .section1__title {
     font-size: 12px;
   }
 }
-
 .our-story .section1__flexCol1 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 56px 0px 0px;
 }
-
 .our-story .section1__highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -115,47 +99,40 @@
   min-height: 134px;
   margin: 0px 1px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .our-story .section1__highlights {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .our-story .section1__flexCol2 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 61px 1px 0px 0px;
 }
-
 .our-story .section1__medium_title {
   font: 400 26px/1.34 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 @media (max-width: 991px) {
   .our-story .section1__medium_title {
     font-size: 20px;
     text-align: left;
   }
 }
-
 @media (max-width: 767px) {
   .our-story .section1__medium_title {
     font-size: 16px;
   }
 }
-
 @media (max-width: 383px) {
   .our-story .section1__medium_title {
     font-size: 12px;
   }
 }
-
 .our-story .section1__highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -164,14 +141,12 @@
   min-height: 156px;
   margin: 22px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .our-story .section1__highlights1 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .our-story .section1__highlights2 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -180,14 +155,12 @@
   min-height: 106px;
   margin: 77px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .our-story .section1__highlights2 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .our-story .section2 {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/OurStory/OurStory.html b/src/views/layouts/OurStory/OurStory.html
index 1233e08..fcb31cf 100644
--- a/src/views/layouts/OurStory/OurStory.html
+++ b/src/views/layouts/OurStory/OurStory.html
@@ -1,182 +1,211 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <!-- Font Awesome is an icon library -->
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
-  <!-- 'Animate On Scroll' library -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <!-- Bootstrap linker -->
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\OurStory\OurStory.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
 
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+  </head>
 
-  <link rel="stylesheet" type="text/css" href="\src\views\layouts\OurStory\OurStory.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Header\Header0.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Footer\Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-</head>
-
-<body class="flex-column">
-  <header id="header" class="headroom">
-    <nav class="max:show">
-      <!-- prettier-ignore -->
-      <div class="header0 header0__group1">
-        <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
-          <div class="spacer"></div>
-          <div class="header0__box">
-            <div class="header0__flexRow1">
-              <div class="cell">
-                <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr">
-                  <div class="header0__txt"
-                    onclick="window.location.href = '/src/views/layouts/ShopPage/ShopPage.html'">Shop</div>
-                </px-grid>
-              </div>
-              <div class="cell1">
-                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
-              </div>
+  <body class="flex-column">
+    <header id="header" class="headroom">
+      <nav class="max:show">
+        <!-- prettier-ignore -->
+        <div class="header0 header0__group1">
+            <div class="header0__flexRow">
+              <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
               <div class="spacer"></div>
-              <div class="header0__rect5"></div>
-              <div class="spacer1"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" onclick="alert(`It is clickable`)" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell3">
-                <img src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png" alt="alt text"
-                  class="header0__icon1" onclick="window.location.href='/src/views/layouts/Cart/Cart.html'" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="alert(`It is clickable`)" />
+              <div class="header0__box">
+                <div class="header0__flexRow1">
+                  <div class="cell">
+                    <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr"
+                      ><div class="header0__txt" onclick="window.location.href = 'ShopPage.html'">Shop</div></px-grid
+                    >
+                  </div>
+                  <div class="cell1"><h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4></div>
+                  <div class="spacer"></div>
+                  <div class="header0__rect5"></div>
+                  <div class="spacer1"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png"
+                      alt="alt text"
+                      class="header0__image10"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell3">
+                    <img
+                      src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png"
+                      alt="alt text"
+                      class="header0__icon1"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png"
+                      alt="alt text"
+                      class="header0__icon"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-      </div>
-    </nav>
-  </header>
-  <main class="our-story main">
-    <div class="cell">
-      <!-- ======= section1 ======= -->
-      <section class="section1__section1">
-        <div class="section1__flexCol">
-          <h1 class="section1__title">About Us</h1>
-          <div class="section1__flexCol1">
-            <h5 class="section1__highlights">
-              Welcome to Urusta, your ultimate destination for all things
-              coffee! We are a passionate team of coffee enthusiasts dedicated
-              to bringing you the finest selection of coffee machines and a
-              wide range of other coffee-related products. Whether you&#x27;re
-              a casual coffee lover or a seasoned connoisseur, we have
-              everything you need to enhance your coffee experience.
-            </h5>
-            <div class="section1__flexCol2">
-              <h2 class="section1__medium_title">Quality</h2>
-              <h5 class="section1__highlights1">
-                We pride ourselves on providing exceptional customer service
-                and ensuring your complete satisfaction. Our knowledgeable
-                team is always ready to assist you in finding the perfect
-                coffee machine or product that matches your needs and
-                preferences. We understand that choosing the right equipment
-                can be overwhelming, so we are here to guide you through the
-                selection process, answer your questions, and provide
-                personalized recommendations.
-              </h5>
-            </div>
-            <div class="section1__flexCol2">
-              <h2 class="section1__medium_title">Discover</h2>
-              <h5 class="section1__highlights1">
-                We pride ourselves on providing exceptional customer service
-                and ensuring your complete satisfaction. Our knowledgeable
-                team is always ready to assist you in finding the perfect
-                coffee machine or product that matches your needs and
-                preferences. We understand that choosing the right equipment
-                can be overwhelming, so we are here to guide you through the
-                selection process, answer your questions, and provide
-                personalized recommendations.
+      </nav>
+    </header>
+    <main class="our-story main">
+      <div class="cell">
+        <!-- ======= section1 ======= -->
+        <section class="section1__section1">
+          <div class="section1__flexCol">
+            <h1 class="section1__title">About Us</h1>
+            <div class="section1__flexCol1">
+              <h5 class="section1__highlights">
+                Welcome to Urusta, your ultimate destination for all things
+                coffee! We are a passionate team of coffee enthusiasts dedicated
+                to bringing you the finest selection of coffee machines and a
+                wide range of other coffee-related products. Whether you&#x27;re
+                a casual coffee lover or a seasoned connoisseur, we have
+                everything you need to enhance your coffee experience.
               </h5>
-            </div>
-            <h5 class="section1__highlights2">
-              Thank you for choosing Urusta as your trusted destination for
-              all your coffee needs. We look forward to serving you and being
-              a part of your coffee journey. Get ready to awaken your senses
-              and savor the rich flavors and aromas of the perfect cup of
-              coffee. Cheers!<br />
-            </h5>
-          </div>
-        </div>
-      </section>
-      <!-- ======= End section1 ======= -->
-    </div>
-    <div class="section2">
-      <!-- prettier-ignore -->
-      <section class="footer footer__section2">
-        <hr size="1" class="footer__line" />
-        <div class="footer__group">
-          <div class="footer__nullContent">
-            <div class="footer__flexCol">
-              <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
-                <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
+              <div class="section1__flexCol2">
+                <h2 class="section1__medium_title">Quality</h2>
+                <h5 class="section1__highlights1">
+                  We pride ourselves on providing exceptional customer service
+                  and ensuring your complete satisfaction. Our knowledgeable
+                  team is always ready to assist you in finding the perfect
+                  coffee machine or product that matches your needs and
+                  preferences. We understand that choosing the right equipment
+                  can be overwhelming, so we are here to guide you through the
+                  selection process, answer your questions, and provide
+                  personalized recommendations.
+                </h5>
+              </div>
+              <div class="section1__flexCol2">
+                <h2 class="section1__medium_title">Discover</h2>
+                <h5 class="section1__highlights1">
+                  We pride ourselves on providing exceptional customer service
+                  and ensuring your complete satisfaction. Our knowledgeable
+                  team is always ready to assist you in finding the perfect
+                  coffee machine or product that matches your needs and
+                  preferences. We understand that choosing the right equipment
+                  can be overwhelming, so we are here to guide you through the
+                  selection process, answer your questions, and provide
+                  personalized recommendations.
+                </h5>
               </div>
-              <h5 class="footer__highlights_box">
-                <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                    class="footer__highlights_span1"> Terms of use </span><span
-                    class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                    policy.</span></span>
+              <h5 class="section1__highlights2">
+                Thank you for choosing Urusta as your trusted destination for
+                all your coffee needs. We look forward to serving you and being
+                a part of your coffee journey. Get ready to awaken your senses
+                and savor the rich flavors and aromas of the perfect cup of
+                coffee. Cheers!<br />
               </h5>
             </div>
-            <div class="spacer"></div>
-            <div class="footer__flexCol1">
-              <br>
-              <div class="footer__flexCol2">
-                <div class="footer__group1">
-                  <div class="footer__highlights13">
-                    <input class="form-control email-input" type="text"
-                      placeholder="Enter your email, get the newsletter!">
+          </div>
+        </section>
+        <!-- ======= End section1 ======= -->
+      </div>
+      <div class="section2">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
                   </div>
-                  <div class="footer__image-container">
-                    <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                      alt="A clickable arrow to submit email" class="footer__image1"
-                      onclick="alert(`It is clickable`)" />
-                    <!-- Send an email with newsletter -->
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
+                <div class="spacer"></div>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
                 </div>
-                <br><br>
-                <hr size="1" class="footer__line1" />
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-          </div>
-          <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-            class="footer__image2" />
-        </div>
-      </section>
-    </div>
-  </main>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-
-  <script type="text/javascript">
-    AOS.init();
-    const header = document.querySelector("#header");
-    if (header) {
-      const headroom = new Headroom(header);
-      headroom.init();
-    }
-  </script>
-</body>
+          </section>
+      </div>
+    </main>
+    <script type="text/javascript">
+      AOS.init();
 
-</html>
\ No newline at end of file
+      const header = document.querySelector("#header");
+      if (header) {
+        const headroom = new Headroom(header);
+        headroom.init();
+      }
+    </script>
+  </body>
+</html>
diff --git a/src/views/layouts/PageNotFound/PageNotFound.css b/src/views/layouts/PageNotFound/PageNotFound.css
index 8c64a93..d155d99 100644
--- a/src/views/layouts/PageNotFound/PageNotFound.css
+++ b/src/views/layouts/PageNotFound/PageNotFound.css
@@ -5,7 +5,6 @@
   position: relative;
   overflow: hidden;
 }
-
 .page-not-found .flexCol {
   display: flex;
   flex-direction: column;
@@ -13,25 +12,21 @@
   position: relative;
   margin: 220px auto 0px;
 }
-
 @media (max-width: 575px) {
   .page-not-found .flexCol {
     width: 33.11%;
   }
 }
-
 @media (max-width: 479px) {
   .page-not-found .flexCol {
     width: 39.76%;
   }
 }
-
 @media (max-width: 383px) {
   .page-not-found .flexCol {
     width: 46.81%;
   }
 }
-
 .page-not-found .title {
   display: flex;
   font: 500 33px/1.3 "DM Sans", Helvetica, Arial, serif;
@@ -40,40 +35,34 @@
   width: 110px;
   position: relative;
   min-width: 110px;
-  margin: 2px auto;
+  margin: 0px auto;
 }
-
 @media (max-width: 2999px) {
   .page-not-found .title {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 1199px) {
   .page-not-found .title {
     font-size: 28px;
   }
 }
-
 @media (max-width: 991px) {
   .page-not-found .title {
     font-size: 24px;
   }
 }
-
 @media (max-width: 767px) {
   .page-not-found .title {
     font-size: 20px;
   }
 }
-
 @media (max-width: 383px) {
   .page-not-found .title {
     font-size: 12px;
   }
 }
-
 .page-not-found .subtitle {
   display: flex;
   justify-content: center;
@@ -84,19 +73,16 @@
   position: relative;
   margin: 47px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .page-not-found .subtitle {
     font-size: 16px;
   }
 }
-
 @media (max-width: 383px) {
   .page-not-found .subtitle {
     font-size: 12px;
   }
 }
-
 .page-not-found .content_box {
   display: flex;
   flex-direction: column;
@@ -109,7 +95,6 @@
   position: relative;
   margin: 23px auto 0px;
 }
-
 .page-not-found .highlights {
   display: flex;
   font: 700 18px/1.27 "DM Sans", Helvetica, Arial, serif;
@@ -121,21 +106,18 @@
   min-width: 100px;
   margin: 22px auto 23px;
 }
-
 @media (max-width: 2999px) {
   .page-not-found .highlights {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 767px) {
   .page-not-found .highlights {
     font-size: 12px;
   }
 }
-
 .page-not-found .component {
   position: relative;
   margin: 313px 0px 67px;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/PageNotFound/PageNotFound.html b/src/views/layouts/PageNotFound/PageNotFound.html
index 68518c1..a152478 100644
--- a/src/views/layouts/PageNotFound/PageNotFound.html
+++ b/src/views/layouts/PageNotFound/PageNotFound.html
@@ -1,140 +1,169 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <!-- Font Awesome is an icon library -->
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
-  <!-- 'Animate On Scroll' library -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <!-- Bootstrap linker -->
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\PageNotFound\PageNotFound.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
 
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+  </head>
 
-  <link rel="stylesheet" type="text/css" href="\src\views\layouts\PageNotFound\PageNotFound.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Header\Header0.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Footer\Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-</head>
-
-<body class="flex-column">
-  <header id="header" class="headroom">
-    <nav class="max:show">
-      <!-- prettier-ignore -->
-      <div class="header0 header0__group1">
-        <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
-          <div class="spacer"></div>
-          <div class="header0__box">
-            <div class="header0__flexRow1">
-              <div class="cell">
-                <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr">
-                  <div class="header0__txt" onclick="window.location.href='/src/views/layouts/ShopPage/ShopPage.html'">
-                    Shop</div>
-                </px-grid>
-              </div>
-              <div class="cell1">
-                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
-              </div>
+  <body class="flex-column">
+    <header id="header" class="headroom">
+      <nav class="max:show">
+        <!-- prettier-ignore -->
+        <div class="header0 header0__group1">
+            <div class="header0__flexRow">
+              <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
               <div class="spacer"></div>
-              <div class="header0__rect5"></div>
-              <div class="spacer1"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" onclick="alert(`It is clickable`)" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell3">
-                <img src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png" alt="alt text"
-                  class="header0__icon1" onclick="window.location.href='/src/views/layouts/Cart/Cart.html'" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="alert(`It is clickable`)" />
+              <div class="header0__box">
+                <div class="header0__flexRow1">
+                  <div class="cell">
+                    <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr"
+                      ><div class="header0__txt" onclick="window.location.href = 'ShopPage.html'">Shop</div></px-grid
+                    >
+                  </div>
+                  <div class="cell1"><h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4></div>
+                  <div class="spacer"></div>
+                  <div class="header0__rect5"></div>
+                  <div class="spacer1"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png"
+                      alt="alt text"
+                      class="header0__image10"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell3">
+                    <img
+                      src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png"
+                      alt="alt text"
+                      class="header0__icon1"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png"
+                      alt="alt text"
+                      class="header0__icon"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                </div>
               </div>
             </div>
           </div>
+      </nav>
+    </header>
+    <div class="page-not-found root">
+      <div class="flexCol">
+        <h1 class="title">OH No!</h1>
+        <h3 class="subtitle">
+          This page not found!<br />
+          go back to home and start again<br /><br /><br /><br /><br />
+        </h3>
+        <div class="content_box" onclick="alert(`It is clickable`)">
+          <h4 class="highlights">HOMEPAGE</h4>
         </div>
       </div>
-    </nav>
-  </header>
-  <div class="page-not-found root">
-    <div class="flexCol">
-      <h1 class="title">Oh No!</h1>
-      <h3 class="subtitle">
-        Page not found!<br />
-        Go back to home page and start again<br /><br />
-      </h3>
-      <div class="content_box" onclick="alert(`It is clickable`)">
-        <h4 class="highlights">HOMEPAGE</h4>
-      </div>
-    </div>
-    <div class="component">
-      <!-- prettier-ignore -->
-      <section class="footer footer__section2">
-        <hr size="1" class="footer__line" />
-        <div class="footer__group">
-          <div class="footer__nullContent">
-            <div class="footer__flexCol">
-              <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
-                <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
-              </div>
-              <h5 class="footer__highlights_box">
-                <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                    class="footer__highlights_span1"> Terms of use </span><span
-                    class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                    policy.</span></span>
-              </h5>
-            </div>
-            <div class="spacer"></div>
-            <div class="footer__flexCol1">
-              <br>
-              <div class="footer__flexCol2">
-                <div class="footer__group1">
-                  <div class="footer__highlights13">
-                    <input class="form-control email-input" type="text"
-                      placeholder="Enter your email, get the newsletter!">
+      <div class="component">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
                   </div>
-                  <div class="footer__image-container">
-                    <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                      alt="A clickable arrow to submit email" class="footer__image1"
-                      onclick="alert(`It is clickable`)" />
-                    <!-- Send an email with newsletter -->
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
+                <div class="spacer"></div>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
                 </div>
-                <br><br>
-                <hr size="1" class="footer__line1" />
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-          </div>
-          <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-            class="footer__image2" />
-        </div>
-      </section>
+          </section>
+      </div>
     </div>
-  </div>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-
-  <script type="text/javascript">
-    AOS.init();
-    const header = document.querySelector("#header");
-    if (header) {
-      const headroom = new Headroom(header);
-      headroom.init();
-    }
-  </script>
-</body>
+    <script type="text/javascript">
+      AOS.init();
 
-</html>
\ No newline at end of file
+      const header = document.querySelector("#header");
+      if (header) {
+        const headroom = new Headroom(header);
+        headroom.init();
+      }
+    </script>
+  </body>
+</html>
diff --git a/src/views/layouts/PrivacyPolicy/PrivacyPolicy.css b/src/views/layouts/PrivacyPolicy/PrivacyPolicy.css
index fe64125..da37a5c 100644
--- a/src/views/layouts/PrivacyPolicy/PrivacyPolicy.css
+++ b/src/views/layouts/PrivacyPolicy/PrivacyPolicy.css
@@ -5,45 +5,38 @@
   position: relative;
   overflow: hidden;
 }
-
 .privacy-policy .flexCol {
   display: flex;
   flex-direction: column;
   width: 41.15%;
   position: relative;
-  margin: 100px auto 0px;
+  margin: 220px auto 0px;
 }
-
 @media (max-width: 991px) {
   .privacy-policy .flexCol {
     width: 48.24%;
   }
 }
-
 @media (max-width: 767px) {
   .privacy-policy .flexCol {
     width: 55.41%;
   }
 }
-
 @media (max-width: 575px) {
   .privacy-policy .flexCol {
     width: 62.36%;
   }
 }
-
 @media (max-width: 479px) {
   .privacy-policy .flexCol {
     width: 68.84%;
   }
 }
-
 @media (max-width: 383px) {
   .privacy-policy .flexCol {
     width: 74.65%;
   }
 }
-
 .privacy-policy .title {
   display: flex;
   font: 500 33px/1.3 "DM Sans", Helvetica, Arial, serif;
@@ -53,45 +46,38 @@
   position: relative;
   margin: 0px auto;
 }
-
 @media (max-width: 2999px) {
   .privacy-policy .title {
     text-align: center;
     justify-content: center;
   }
 }
-
 @media (max-width: 1199px) {
   .privacy-policy .title {
     font-size: 28px;
   }
 }
-
 @media (max-width: 991px) {
   .privacy-policy .title {
     font-size: 24px;
   }
 }
-
 @media (max-width: 767px) {
   .privacy-policy .title {
     font-size: 20px;
   }
 }
-
 @media (max-width: 383px) {
   .privacy-policy .title {
     font-size: 12px;
   }
 }
-
 .privacy-policy .flexCol1 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 50px 0px 0px;
 }
-
 .privacy-policy .highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -100,47 +86,40 @@
   min-height: 131px;
   margin: 0px 0px 15px;
 }
-
 @media (max-width: 1199px) {
   .privacy-policy .highlights {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .privacy-policy .flexCol2 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 5px 0px 0px;
 }
-
 .privacy-policy .medium_title {
   font: 400 26px/0.96 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 @media (max-width: 991px) {
   .privacy-policy .medium_title {
     font-size: 20px;
     text-align: left;
   }
 }
-
 @media (max-width: 767px) {
   .privacy-policy .medium_title {
     font-size: 16px;
   }
 }
-
 @media (max-width: 383px) {
   .privacy-policy .medium_title {
     font-size: 12px;
   }
 }
-
 .privacy-policy .highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -149,33 +128,28 @@
   min-height: 115px;
   margin: 18px 0px 0px 5px;
 }
-
 @media (max-width: 1199px) {
   .privacy-policy .highlights1 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .privacy-policy .flexCol3 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 20px 15px 0px 5px;
 }
-
 @media (max-width: 991px) {
   .privacy-policy .flexCol3 {
     margin: 20px 8px 0px 5px;
   }
 }
-
 @media (max-width: 383px) {
   .privacy-policy .flexCol3 {
     margin: 20px 4px 0px 5px;
   }
 }
-
 .privacy-policy .highlights2 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -184,15 +158,13 @@
   min-height: 110px;
   margin: 18px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .privacy-policy .highlights2 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .privacy-policy .component {
   position: relative;
   margin: 84px 0px 67px;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/PrivacyPolicy/PrivacyPolicy.html b/src/views/layouts/PrivacyPolicy/PrivacyPolicy.html
index 4db3b72..8789bbf 100644
--- a/src/views/layouts/PrivacyPolicy/PrivacyPolicy.html
+++ b/src/views/layouts/PrivacyPolicy/PrivacyPolicy.html
@@ -1,162 +1,191 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <!-- Font Awesome is an icon library -->
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
-  <!-- 'Animate On Scroll' library -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <!-- Bootstrap linker -->
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\PrivacyPolicy\PrivacyPolicy.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
 
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+  </head>
 
-  <link rel="stylesheet" type="text/css" href="\src\views\layouts\PrivacyPolicy\PrivacyPolicy.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Header\Header0.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Footer\Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-</head>
-
-<body class="flex-column">
-  <header id="header" class="headroom">
-    <nav class="max:show">
-      <!-- prettier-ignore -->
-      <div class="header0 header0__group1">
-        <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
-          <div class="spacer"></div>
-          <div class="header0__box">
-            <div class="header0__flexRow1">
-              <div class="cell">
-                <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr">
-                  <div class="header0__txt" onclick="window.location.href='/src/views/layouts/ShopPage/ShopPage.html'">
-                    Shop</div>
-                </px-grid>
-              </div>
-              <div class="cell1">
-                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
-              </div>
+  <body class="flex-column">
+    <header id="header" class="headroom">
+      <nav class="max:show">
+        <!-- prettier-ignore -->
+        <div class="header0 header0__group1">
+            <div class="header0__flexRow">
+              <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
               <div class="spacer"></div>
-              <div class="header0__rect5"></div>
-              <div class="spacer1"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" onclick="alert(`It is clickable`)" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell3">
-                <img src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png" alt="alt text"
-                  class="header0__icon1" onclick="window.location.href='/src/views/layouts/Cart/Cart.html'" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="alert(`It is clickable`)" />
+              <div class="header0__box">
+                <div class="header0__flexRow1">
+                  <div class="cell">
+                    <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr"
+                      ><div class="header0__txt" onclick="window.location.href = 'ShopPage.html'">Shop</div></px-grid
+                    >
+                  </div>
+                  <div class="cell1"><h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4></div>
+                  <div class="spacer"></div>
+                  <div class="header0__rect5"></div>
+                  <div class="spacer1"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png"
+                      alt="alt text"
+                      class="header0__image10"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell3">
+                    <img
+                      src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png"
+                      alt="alt text"
+                      class="header0__icon1"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png"
+                      alt="alt text"
+                      class="header0__icon"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-      </div>
-    </nav>
-  </header>
-  <div class="privacy-policy root">
-    <div class="flexCol">
-      <h1 class="title">Privacy Policy</h1>
-      <div class="flexCol1">
-        <h5 class="highlights">
-          This Privacy Policy describes how Urusta collect, use, and disclose
-          information about you. This Privacy Policy applies to information
-          that we collect when you use or access our websites, mobile
-          applications, and services that display or link to this Privacy
-          Policy, or when you otherwise interact with us.<br />
-        </h5>
-        <div class="flexCol2">
-          <h2 class="medium_title">Security</h2>
-          <h5 class="highlights1">
-            We use standard security measures. While we make every effort to
-            help ensure the integrity and security of our network and systems,
-            the Internet is not 100% secure. We cannot promise that your use
-            of our sites and apps will be completely safe. We encourage you to
-            use caution, and not to share or reuse passwords.
-          </h5>
-        </div>
-        <div class="flexCol3">
-          <h2 class="medium_title">We Combine Imformation</h2>
-          <h5 class="highlights2">
-            We may combine the information we receive from and about you,
-            including information you provide to us and information we
-            automatically collect through our Services, as well as information
-            collected offline, across other computers or devices that you may
-            use, and from third party sources.
+      </nav>
+    </header>
+    <div class="privacy-policy root">
+      <div class="flexCol">
+        <h1 class="title">Privacy Policy</h1>
+        <div class="flexCol1">
+          <h5 class="highlights">
+            This Privacy Policy describes how Urusta collect, use, and disclose
+            information about you. This Privacy Policy applies to information
+            that we collect when you use or access our websites, mobile
+            applications, and services that display or link to this Privacy
+            Policy, or when you otherwise interact with us.<br />
           </h5>
+          <div class="flexCol2">
+            <h2 class="medium_title">Security</h2>
+            <h5 class="highlights1">
+              We use standard security measures. While we make every effort to
+              help ensure the integrity and security of our network and systems,
+              the Internet is not 100% secure. We cannot promise that your use
+              of our sites and apps will be completely safe. We encourage you to
+              use caution, and not to share or reuse passwords.
+            </h5>
+          </div>
+          <div class="flexCol3">
+            <h2 class="medium_title">We Combine Imformation</h2>
+            <h5 class="highlights2">
+              We may combine the information we receive from and about you,
+              including information you provide to us and information we
+              automatically collect through our Services, as well as information
+              collected offline, across other computers or devices that you may
+              use, and from third party sources.
+            </h5>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="component">
-      <!-- prettier-ignore -->
-      <section class="footer footer__section2">
-        <hr size="1" class="footer__line" />
-        <div class="footer__group">
-          <div class="footer__nullContent">
-            <div class="footer__flexCol">
-              <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
-                <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
-              </div>
-              <h5 class="footer__highlights_box">
-                <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                    class="footer__highlights_span1"> Terms of use </span><span
-                    class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                    policy.</span></span>
-              </h5>
-            </div>
-            <div class="spacer"></div>
-            <div class="footer__flexCol1">
-              <br>
-              <div class="footer__flexCol2">
-                <div class="footer__group1">
-                  <div class="footer__highlights13">
-                    <input class="form-control email-input" type="text"
-                      placeholder="Enter your email, get the newsletter!">
+      <div class="component">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
                   </div>
-                  <div class="footer__image-container">
-                    <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                      alt="A clickable arrow to submit email" class="footer__image1"
-                      onclick="alert(`It is clickable`)" />
-                    <!-- Send an email with newsletter -->
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
+                <div class="spacer"></div>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
                 </div>
-                <br><br>
-                <hr size="1" class="footer__line1" />
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-          </div>
-          <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-            class="footer__image2" />
-        </div>
-      </section>
+          </section>
+      </div>
     </div>
-  </div>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-
-  <script type="text/javascript">
-    AOS.init();
-    const header = document.querySelector("#header");
-    if (header) {
-      const headroom = new Headroom(header);
-      headroom.init();
-    }
-  </script>
-</body>
+    <script type="text/javascript">
+      AOS.init();
 
-</html>
\ No newline at end of file
+      const header = document.querySelector("#header");
+      if (header) {
+        const headroom = new Headroom(header);
+        headroom.init();
+      }
+    </script>
+  </body>
+</html>
diff --git a/src/views/layouts/ProductPage/ProductPage.css b/src/views/layouts/ProductPage/ProductPage.css
index ddef55b..bb57762 100644
--- a/src/views/layouts/ProductPage/ProductPage.css
+++ b/src/views/layouts/ProductPage/ProductPage.css
@@ -7,7 +7,6 @@
   overflow: hidden;
   min-height: 2317px;
 }
-
 .product-page .line2 {
   background-color: rgb(216, 216, 216);
   width: 1249px;
@@ -16,27 +15,23 @@
   top: 1px;
   left: -1px;
 }
-
 .product-page .flexCol {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
-.product-page .flexCol>.cell {
+.product-page .flexCol > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .product-page .section1__section1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .product-page .section1__flexCol {
   display: flex;
   flex-direction: column;
@@ -45,14 +40,12 @@
   flex-grow: 1;
   margin: 250px auto 199px;
 }
-
 .product-page .section1__group {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 0px 11px;
 }
-
 .product-page .section1__line1 {
   background-color: rgb(216, 216, 216);
   height: 2px;
@@ -61,34 +54,29 @@
   left: 200px;
   right: 699px;
 }
-
 .product-page .section1__flexRow {
   display: flex;
   align-items: center;
   position: relative;
   flex-grow: 1;
 }
-
 .product-page .section1__flexRow1 {
   display: flex;
   align-items: center;
   position: relative;
   flex: 0 1 880px;
 }
-
 .product-page .section1__flexCol1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 133px;
 }
-
-.product-page .section1__flexCol1>.cell {
+.product-page .section1__flexCol1 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .product-page .section1__image3 {
   width: calc(100% - 0px);
   height: auto;
@@ -98,7 +86,6 @@
   object-position: center center;
   position: relative;
 }
-
 .product-page .section1__image31 {
   width: calc(100% - 0px);
   height: auto;
@@ -109,18 +96,15 @@
   position: relative;
   margin: 40px 0px 0px;
 }
-
-.product-page .section1__flexRow1>.spacer {
+.product-page .section1__flexRow1 > .spacer {
   flex: 0 1 68px;
 }
-
-.product-page .section1__flexRow1>.cell {
+.product-page .section1__flexRow1 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 679px;
 }
-
 .product-page .section1__image4 {
   width: calc(100% - 0px);
   height: auto;
@@ -131,11 +115,9 @@
   position: relative;
   margin: 0px 0px 24px;
 }
-
-.product-page .section1__flexRow>.spacer {
+.product-page .section1__flexRow > .spacer {
   flex: 1 1 77px;
 }
-
 .product-page .section1__flexCol2 {
   display: flex;
   flex-direction: column;
@@ -143,7 +125,6 @@
   flex: 0 1 611px;
   margin: 0px 0px 18px;
 }
-
 .product-page .section1__flexCol3 {
   display: flex;
   flex-direction: column;
@@ -151,7 +132,6 @@
   position: relative;
   margin: 0px 68.74% 0px 0.33%;
 }
-
 .product-page .section1__medium_title {
   font: 400 26px/1 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -159,7 +139,6 @@
   min-width: 190px;
   position: relative;
 }
-
 .product-page .section1__subtitle {
   font: 500 22px/1.18 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -167,21 +146,18 @@
   position: relative;
   margin: 26px 0px 0px;
 }
-
 .product-page .section1__flexRow2 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 23px 4px 0px;
 }
-
-.product-page .section1__flexRow2>.cell {
+.product-page .section1__flexRow2 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 22px;
 }
-
 .product-page .section1__image {
   width: 22px;
   height: auto;
@@ -193,18 +169,15 @@
   min-width: 22px;
   margin: 1px 0px 10px;
 }
-
-.product-page .section1__flexRow2>.spacer {
+.product-page .section1__flexRow2 > .spacer {
   flex: 0 1 13px;
 }
-
-.product-page .section1__flexRow2>.cell1 {
+.product-page .section1__flexRow2 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 23px;
 }
-
 .product-page .section1__image1 {
   width: 23px;
   height: auto;
@@ -216,15 +189,12 @@
   min-width: 23px;
   margin: 1px 0px 10px;
 }
-
-.product-page .section1__flexRow2>.spacer1 {
+.product-page .section1__flexRow2 > .spacer1 {
   flex: 0 1 12px;
 }
-
-.product-page .section1__flexRow2>.spacer2 {
+.product-page .section1__flexRow2 > .spacer2 {
   flex: 0 1 29px;
 }
-
 .product-page .section1__highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -233,7 +203,6 @@
   flex: 0 0 auto;
   min-width: 192px;
 }
-
 .product-page .section1__highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -242,14 +211,12 @@
   min-height: 238px;
   margin: 5px 2px 0px 0px;
 }
-
 .product-page .section1__flexCol4 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 17px 0px 0px 2px;
 }
-
 .product-page .section1__box {
   display: flex;
   flex-direction: column;
@@ -262,7 +229,6 @@
   position: relative;
   margin: 0px 0% 0px 25.94%;
 }
-
 .product-page .section1__highlights2 {
   display: flex;
   justify-content: center;
@@ -276,7 +242,6 @@
   min-width: 130px;
   margin: 14px auto;
 }
-
 .product-page .section1__content_box {
   display: flex;
   flex-direction: column;
@@ -288,7 +253,6 @@
   bottom: -2px;
   left: -158px;
 }
-
 .product-page .section1__flexRow3 {
   display: flex;
   align-items: center;
@@ -297,7 +261,6 @@
   height: 2px;
   margin: 14px 18px 12px 21px;
 }
-
 .product-page .section1__highlights3 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -306,11 +269,9 @@
   flex: 0 0 auto;
   min-width: 11px;
 }
-
-.product-page .section1__flexRow3>.spacer {
+.product-page .section1__flexRow3 > .spacer {
   flex: 0 1 30px;
 }
-
 .product-page .section1__highlights4 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -319,11 +280,9 @@
   flex: 0 0 auto;
   min-width: 6px;
 }
-
-.product-page .section1__flexRow3>.spacer1 {
+.product-page .section1__flexRow3 > .spacer1 {
   flex: 0 1 31px;
 }
-
 .product-page .section1__highlights5 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -332,21 +291,18 @@
   flex: 0 0 auto;
   min-width: 12px;
 }
-
 .product-page .section1__flexRow4 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 30px 0px 0px;
 }
-
-.product-page .section1__flexRow4>.cell {
+.product-page .section1__flexRow4 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 23px;
 }
-
 .product-page .section1__icon {
   width: 23px;
   height: auto;
@@ -358,11 +314,9 @@
   min-width: 23px;
   margin: 2px 0px 4px;
 }
-
-.product-page .section1__flexRow4>.spacer {
+.product-page .section1__flexRow4 > .spacer {
   flex: 0 1 18px;
 }
-
 .product-page .section1__rect1 {
   background-color: rgb(216, 216, 216);
   position: relative;
@@ -370,18 +324,15 @@
   min-width: 1px;
   min-height: 29px;
 }
-
-.product-page .section1__flexRow4>.spacer1 {
+.product-page .section1__flexRow4 > .spacer1 {
   flex: 0 1 25px;
 }
-
-.product-page .section1__flexRow4>.cell1 {
+.product-page .section1__flexRow4 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 171px;
 }
-
 .product-page .section1__image7 {
   width: calc(100% - 0px);
   height: auto;
@@ -392,7 +343,6 @@
   position: relative;
   margin: 3px 0px;
 }
-
 .product-page .section1__flexRow5 {
   display: flex;
   align-items: center;
@@ -400,7 +350,6 @@
   position: relative;
   margin: 53px 0px 0px;
 }
-
 .product-page .section1__highlights11 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -409,7 +358,6 @@
   flex: 0 0 auto;
   min-width: 107px;
 }
-
 .product-page .section1__highlights6 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -418,28 +366,24 @@
   flex: 0 0 auto;
   min-width: 185px;
 }
-
 .product-page .section1__flexCol5 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 123px 20px 0px 0px;
 }
-
 .product-page .section1__flexCol6 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 0px 1px 0px 0px;
 }
-
 .product-page .section1__flexRow6 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 0px 10px;
 }
-
 @media (max-width: 1919px) {
   .product-page .section1__flexRow6 {
     justify-content: flex-start;
@@ -447,15 +391,13 @@
     column-gap: 0px;
   }
 }
-
-.product-page .section1__flexRow6>.cell {
+.product-page .section1__flexRow6 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 0 135px;
   min-width: 135px;
 }
-
 .product-page .section1__subtitle1 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -465,26 +407,22 @@
   position: relative;
   flex-grow: 1;
 }
-
-.product-page .section1__flexRow6>.spacer {
+.product-page .section1__flexRow6 > .spacer {
   flex: 0 1 133px;
 }
-
-.product-page .section1__flexRow6>.cell1 {
+.product-page .section1__flexRow6 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 0 205px;
   min-width: 205px;
 }
-
 .product-page .section1__group1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .product-page .section1__line3 {
   background-color: rgb(0, 0, 0);
   height: 1px;
@@ -493,7 +431,6 @@
   left: 0px;
   right: 0px;
 }
-
 .product-page .section1__subtitle2 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -501,26 +438,22 @@
   position: relative;
   flex-grow: 1;
 }
-
-.product-page .section1__flexRow6>.spacer1 {
+.product-page .section1__flexRow6 > .spacer1 {
   flex: 0 1 122px;
 }
-
 @media (max-width: 1919px) {
-  .product-page .section1__flexRow6>.spacer1 {
+  .product-page .section1__flexRow6 > .spacer1 {
     min-width: unset;
     display: flex;
   }
 }
-
-.product-page .section1__flexRow6>.cell2 {
+.product-page .section1__flexRow6 > .cell2 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 0 116px;
   min-width: 116px;
 }
-
 .product-page .section1__content_box1 {
   display: flex;
   flex-direction: column;
@@ -528,82 +461,70 @@
   position: relative;
   margin: 17px 0px 0px;
 }
-
 .product-page .section1__highlights12_box {
   position: relative;
   min-height: 175px;
   margin: 55px 0px 0px 10px;
 }
-
 .product-page .section1__highlights12 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span0 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span1 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span2 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span3 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span4 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span5 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span6 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__highlights12_span7 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .product-page .section1__flexCol7 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 57px 0px 0px 10px;
 }
-
 .product-page .section1__medium_title1 {
   font: 400 26px/1.34 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -611,27 +532,23 @@
   min-width: 190px;
   position: relative;
 }
-
 .product-page .section1__flexRow7 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 19px 0px 0px;
 }
-
 .product-page .section1__flexCol8 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 478px;
 }
-
-.product-page .section1__flexCol8>.cell {
+.product-page .section1__flexCol8 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .product-page .section1__image2 {
   width: calc(100% - 0px);
   height: auto;
@@ -641,7 +558,6 @@
   object-position: center center;
   position: relative;
 }
-
 .product-page .section1__subtitle21 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -649,7 +565,6 @@
   position: relative;
   margin: 29px 0px 0px;
 }
-
 .product-page .section1__subtitle3 {
   font: 500 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -657,24 +572,20 @@
   position: relative;
   margin: 20px 0px 0px;
 }
-
-.product-page .section1__flexRow7>.spacer {
+.product-page .section1__flexRow7 > .spacer {
   flex: 1 1 78px;
 }
-
 .product-page .section1__flexCol9 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 479px;
 }
-
-.product-page .section1__flexCol9>.cell {
+.product-page .section1__flexCol9 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .product-page .section1__image5 {
   width: calc(100% - 0px);
   height: auto;
@@ -684,20 +595,17 @@
   object-position: center center;
   position: relative;
 }
-
 .product-page .section1__subtitle22 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
-.product-page .section1__flexCol8>.cell1 {
+.product-page .section1__flexCol8 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .product-page .section1__image6 {
   width: calc(100% - 0px);
   height: auto;
@@ -707,7 +615,6 @@
   object-position: center center;
   position: relative;
 }
-
 .product-page .section1__subtitle31 {
   font: 500 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -715,7 +622,6 @@
   position: relative;
   margin: 21px 0px 0px;
 }
-
 .product-page .section1__group2 {
   display: flex;
   flex-direction: column;
@@ -725,7 +631,6 @@
   top: 0px;
   right: 0px;
 }
-
 .product-page .section1__group3 {
   display: flex;
   flex-direction: column;
@@ -735,7 +640,6 @@
   left: 160px;
   right: 160px;
 }
-
 .product-page .section1__content_box2 {
   display: flex;
   flex-direction: column;
@@ -743,7 +647,6 @@
   position: relative;
   flex-grow: 1;
 }
-
 .product-page .section1__flexRow8 {
   display: flex;
   align-items: center;
@@ -751,7 +654,6 @@
   flex-grow: 1;
   margin: 19px 31px 18px 38px;
 }
-
 .product-page .section1__flexRow9 {
   display: flex;
   align-items: center;
@@ -759,14 +661,12 @@
   flex: 0 0 auto;
   min-width: 426px;
 }
-
-.product-page .section1__flexRow9>.cell {
+.product-page .section1__flexRow9 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 26px;
 }
-
 .product-page .section1__icon1 {
   width: 26px;
   height: auto;
@@ -778,11 +678,9 @@
   min-width: 26px;
   margin: 0px 0px 1px;
 }
-
-.product-page .section1__flexRow9>.spacer {
+.product-page .section1__flexRow9 > .spacer {
   flex: 0 1 32px;
 }
-
 .product-page .section1__highlights13 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -791,11 +689,9 @@
   flex: 0 0 auto;
   min-width: 368px;
 }
-
-.product-page .section1__flexRow8>.spacer {
+.product-page .section1__flexRow8 > .spacer {
   flex: 1 1 994px;
 }
-
 .product-page .section1__highlights31 {
   font: 700 16px/1.31 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -806,7 +702,6 @@
   min-width: 111px;
   margin: 4px 0px 2px;
 }
-
 .product-page .section1__flexCol10 {
   display: flex;
   flex-direction: column;
@@ -816,20 +711,17 @@
   left: 0px;
   right: 0px;
 }
-
 .product-page .section1__line6 {
   background-color: rgb(161, 138, 104);
   height: 2px;
   position: relative;
 }
-
 .product-page .section1__line {
   background-color: rgb(216, 216, 216);
   height: 3px;
   position: relative;
   margin: 2px 0px 0px;
 }
-
 .product-page .section2 {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/ProductPage/ProductPage.html b/src/views/layouts/ProductPage/ProductPage.html
index e27e162..43178ab 100644
--- a/src/views/layouts/ProductPage/ProductPage.html
+++ b/src/views/layouts/ProductPage/ProductPage.html
@@ -1,337 +1,430 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <!-- Font Awesome is an icon library -->
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
-  <!-- 'Animate On Scroll' library -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <!-- Bootstrap linker -->
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\ProductPage\ProductPage.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
 
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+    <script src="https://cdn.jsdelivr.net/gh/px2code/posize/build/v1.01.0.js"></script>
+  </head>
 
-  <link rel="stylesheet" type="text/css" href="\src\views\layouts\ProductPage\ProductPage.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Header\Header0.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Footer\Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/gh/px2code/posize/build/v1.01.0.js"></script>
-</head>
-
-<body class="flex-column">
-  <header id="header" class="headroom">
-    <nav class="max:show">
-      <!-- prettier-ignore -->
-      <div class="header0 header0__group1">
-        <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
-          <div class="spacer"></div>
-          <div class="header0__box">
-            <div class="header0__flexRow1">
-              <div class="cell">
-                <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr">
-                  <div class="header0__txt" onclick="window.location.href='/src/views/layouts/ShopPage/ShopPage.html'">
-                    Shop</div>
-                </px-grid>
-              </div>
-              <div class="cell1">
-                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
-              </div>
-              <div class="spacer"></div>
-              <div class="header0__rect5"></div>
-              <div class="spacer1"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" onclick="alert(`It is clickable`)" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell3">
-                <img src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png" alt="alt text"
-                  class="header0__icon1" onclick="window.location.href='/src/views/layouts/Cart/Cart.html'" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="alert(`It is clickable`)" />
-              </div>
-            </div>
-          </div>
+  <body class="flex-column">
+    <header id="header" class="headroom">
+      <nav class="max:show">
+        <!-- prettier-ignore -->
+        <div class="header0 header0__group1">
+  <div class="header0__flexRow">
+    <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
+    <div class="spacer"></div>
+    <div class="header0__box">
+      <div class="header0__flexRow1">
+        <div class="cell">
+          <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr"
+            ><div class="header0__txt" onclick="window.location.href = 'ShopPage.html'">Shop</div></px-grid
+          >
+        </div>
+        <div class="cell1"><h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4></div>
+        <div class="spacer"></div>
+        <div class="header0__rect5"></div>
+        <div class="spacer1"></div>
+        <div class="cell2">
+          <img
+            src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png"
+            alt="alt text"
+            class="header0__image10"
+            onclick="alert(`It is clickable`)"
+          />
+        </div>
+        <div class="spacer2"></div>
+        <div class="cell3">
+          <img
+            src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png"
+            alt="alt text"
+            class="header0__icon1"
+            onclick="alert(`It is clickable`)"
+          />
+        </div>
+        <div class="spacer2"></div>
+        <div class="cell2">
+          <img
+            src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png"
+            alt="alt text"
+            class="header0__icon"
+            onclick="alert(`It is clickable`)"
+          />
         </div>
       </div>
-    </nav>
-  </header>
-  <main class="product-page main">
-    <div class="line2"></div>
-    <div class="flexCol">
-      <div class="cell">
-        <!-- ======= section1 ======= -->
-        <section class="section1__section1">
-          <div class="section1__flexCol">
-            <div class="section1__group">
-              <hr size="1" class="section1__line1" />
-              <div class="section1__flexRow">
-                <div class="section1__flexRow1">
-                  <div class="section1__flexCol1">
-                    <div class="cell">
-                      <img src="\src\views\partials\assets\7218848a90ba0ee29aeb9d6608aa6e5d.png" alt="alt text"
-                        class="section1__image3" />
-                    </div>
-                    <div class="cell">
-                      <img src="\src\views\partials\assets\42a425149a6f3fa276b21e070b0c0826.png" alt="alt text"
-                        class="section1__image31" />
-                    </div>
-                    <div class="cell">
-                      <img src="\src\views\partials\assets\7f20015f430c3324de93b4722595e677.png" alt="alt text"
-                        class="section1__image31" />
-                    </div>
-                    <div class="cell">
-                      <img src="\src\views\partials\assets\63420a35062d7b7f501744090005c34c.png" alt="alt text"
-                        class="section1__image31" />
-                    </div>
-                  </div>
-                  <div class="spacer"></div>
-                  <div class="cell">
-                    <img src="\src\views\partials\assets\c9d8d92cb2172fc9111422393c390009.png" alt="alt text"
-                      class="section1__image4" />
-                  </div>
-                </div>
-                <div class="spacer"></div>
-                <div class="section1__flexCol2">
-                  <div class="section1__flexCol3">
-                    <h2 class="section1__medium_title">Gran Lattissima</h2>
-                    <h3 class="section1__subtitle">$ 800</h3>
-                  </div>
-                  <div class="section1__flexRow2">
-                    <div class="cell">
-                      <img src="\src\views\partials\assets\f9a490d188a71cce089982a52552aad6.png" alt="alt text"
-                        class="section1__image" />
-                    </div>
-                    <div class="spacer"></div>
-                    <div class="cell1">
-                      <img src="\src\views\partials\assets\d99cd1e43713a7f0fc83fd697ba9f736.png" alt="alt text"
-                        class="section1__image1" />
-                    </div>
-                    <div class="spacer1"></div>
-                    <div class="cell1">
-                      <img src="\src\views\partials\assets\7bc322ded2f5063ac39be8c2f2353c62.png" alt="alt text"
-                        class="section1__image1" />
-                    </div>
-                    <div class="spacer1"></div>
-                    <div class="cell1">
-                      <img src="\src\views\partials\assets\109c23765087e4ab5f4d557c954baee8.png" alt="alt text"
-                        class="section1__image1" />
+    </div>
+  </div>
+</div>
+      </nav>
+    </header>
+    <main class="product-page main">
+      <div class="line2"></div>
+      <div class="flexCol">
+        <div class="cell">
+          <!-- ======= section1 ======= -->
+          <section class="section1__section1">
+            <div class="section1__flexCol">
+              <div class="section1__group">
+                <hr size="1" class="section1__line1" />
+                <div class="section1__flexRow">
+                  <div class="section1__flexRow1">
+                    <div class="section1__flexCol1">
+                      <div class="cell">
+                        <img
+                          src="\src\views\partials\assets\7218848a90ba0ee29aeb9d6608aa6e5d.png"
+                          alt="alt text"
+                          class="section1__image3"
+                        />
+                      </div>
+                      <div class="cell">
+                        <img
+                          src="\src\views\partials\assets\42a425149a6f3fa276b21e070b0c0826.png"
+                          alt="alt text"
+                          class="section1__image31"
+                        />
+                      </div>
+                      <div class="cell">
+                        <img
+                          src="\src\views\partials\assets\7f20015f430c3324de93b4722595e677.png"
+                          alt="alt text"
+                          class="section1__image31"
+                        />
+                      </div>
+                      <div class="cell">
+                        <img
+                          src="\src\views\partials\assets\63420a35062d7b7f501744090005c34c.png"
+                          alt="alt text"
+                          class="section1__image31"
+                        />
+                      </div>
                     </div>
                     <div class="spacer"></div>
                     <div class="cell">
-                      <img src="\src\views\partials\assets\2b8b8f928a1d8f2d0b83e53037b957fa.png" alt="alt text"
-                        class="section1__image" />
+                      <img
+                        src="\src\views\partials\assets\c9d8d92cb2172fc9111422393c390009.png"
+                        alt="alt text"
+                        class="section1__image4"
+                      />
                     </div>
-                    <div class="spacer2"></div>
-                    <h5 class="section1__highlights">79 customer review</h5>
                   </div>
-                  <h5 class="section1__highlights1">
-                    Sophisticated convenience and versatility Whether you’re
-                    in the mood for a cappuccino, a latte, a flat white, or
-                    even if you just want to add a bit more milk froth to your
-                    coffee, just say the word, and let the Gran Lattissima do
-                    the work. <br />With its signature Lattissima design and
-                    one-touch system, it’s easy on the eyes, and easy to use.
-                    The machine is also equipped with an easy rinsing system,
-                    so it cleans up between two recipe preparations, while you
-                    lean back.<br />
-                  </h5>
-                  <div class="section1__flexCol4">
-                    <div class="section1__box" onclick="alert(`It is clickable`)">
-                      <h4 class="section1__highlights2">ADD TO CART</h4>
-                      <div class="section1__content_box">
-                        <div class="section1__flexRow3">
-                          <h5 class="section1__highlights3">-</h5>
-                          <div class="spacer"></div>
-                          <h5 class="section1__highlights4">1</h5>
-                          <div class="spacer1"></div>
-                          <h5 class="section1__highlights5">+</h5>
-                        </div>
-                      </div>
+                  <div class="spacer"></div>
+                  <div class="section1__flexCol2">
+                    <div class="section1__flexCol3">
+                      <h2 class="section1__medium_title">Gran Lattissima</h2>
+                      <h3 class="section1__subtitle">$ 800</h3>
                     </div>
-                    <div class="section1__flexRow4">
+                    <div class="section1__flexRow2">
                       <div class="cell">
-                        <img src="\src\views\partials\assets\51511d3c148c961b07b7a0ebcbaf8b08.png" alt="alt text"
-                          class="section1__icon" />
+                        <img
+                          src="\src\views\partials\assets\f9a490d188a71cce089982a52552aad6.png"
+                          alt="alt text"
+                          class="section1__image"
+                        />
                       </div>
                       <div class="spacer"></div>
-                      <div class="section1__rect1"></div>
+                      <div class="cell1">
+                        <img
+                          src="\src\views\partials\assets\d99cd1e43713a7f0fc83fd697ba9f736.png"
+                          alt="alt text"
+                          class="section1__image1"
+                        />
+                      </div>
+                      <div class="spacer1"></div>
+                      <div class="cell1">
+                        <img
+                          src="\src\views\partials\assets\7bc322ded2f5063ac39be8c2f2353c62.png"
+                          alt="alt text"
+                          class="section1__image1"
+                        />
+                      </div>
                       <div class="spacer1"></div>
                       <div class="cell1">
-                        <img src="\src\views\partials\assets\f2e479b316420072ddc2e15f0c35e682.png" alt="alt text"
-                          class="section1__image7" />
+                        <img
+                          src="\src\views\partials\assets\109c23765087e4ab5f4d557c954baee8.png"
+                          alt="alt text"
+                          class="section1__image1"
+                        />
+                      </div>
+                      <div class="spacer"></div>
+                      <div class="cell">
+                        <img
+                          src="\src\views\partials\assets\2b8b8f928a1d8f2d0b83e53037b957fa.png"
+                          alt="alt text"
+                          class="section1__image"
+                        />
+                      </div>
+                      <div class="spacer2"></div>
+                      <h5 class="section1__highlights">79 customer review</h5>
+                    </div>
+                    <h5 class="section1__highlights1">
+                      Sophisticated convenience and versatility Whether you’re
+                      in the mood for a cappuccino, a latte, a flat white, or
+                      even if you just want to add a bit more milk froth to your
+                      coffee, just say the word, and let the Gran Lattissima do
+                      the work. <br />With its signature Lattissima design and
+                      one-touch system, it’s easy on the eyes, and easy to use.
+                      The machine is also equipped with an easy rinsing system,
+                      so it cleans up between two recipe preparations, while you
+                      lean back.<br />
+                    </h5>
+                    <div class="section1__flexCol4">
+                      <div
+                        class="section1__box"
+                        onclick="alert(`It is clickable`)"
+                      >
+                        <h4 class="section1__highlights2">ADD TO CART</h4>
+                        <div class="section1__content_box">
+                          <div class="section1__flexRow3">
+                            <h5 class="section1__highlights3">-</h5>
+                            <div class="spacer"></div>
+                            <h5 class="section1__highlights4">1</h5>
+                            <div class="spacer1"></div>
+                            <h5 class="section1__highlights5">+</h5>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="section1__flexRow4">
+                        <div class="cell">
+                          <img
+                            src="\src\views\partials\assets\51511d3c148c961b07b7a0ebcbaf8b08.png"
+                            alt="alt text"
+                            class="section1__icon"
+                          />
+                        </div>
+                        <div class="spacer"></div>
+                        <div class="section1__rect1"></div>
+                        <div class="spacer1"></div>
+                        <div class="cell1">
+                          <img
+                            src="\src\views\partials\assets\f2e479b316420072ddc2e15f0c35e682.png"
+                            alt="alt text"
+                            class="section1__image7"
+                          />
+                        </div>
                       </div>
                     </div>
+                    <div class="section1__flexRow5">
+                      <h5 class="section1__highlights11">Categories:</h5>
+                      <h5 class="section1__highlights6">Machines, Milk Pipe</h5>
+                    </div>
                   </div>
-                  <div class="section1__flexRow5">
-                    <h5 class="section1__highlights11">Categories:</h5>
-                    <h5 class="section1__highlights6">Machines, Milk Pipe</h5>
+                </div>
+              </div>
+              <div class="section1__flexCol5">
+                <div class="section1__flexCol6">
+                  <div class="section1__flexRow6">
+                    <div class="cell">
+                      <h3 class="section1__subtitle1">Description</h3>
+                    </div>
+                    <div class="spacer"></div>
+                    <div class="cell1">
+                      <div class="section1__group1">
+                        <hr size="1" class="section1__line3" />
+                        <h3 class="section1__subtitle2">
+                          Additional information
+                        </h3>
+                      </div>
+                    </div>
+                    <div class="spacer1"></div>
+                    <div class="cell2">
+                      <h3 class="section1__subtitle1">Reviews (79)</h3>
+                    </div>
                   </div>
+                  <div class="section1__content_box1"></div>
                 </div>
+                <h5 class="section1__highlights12_box">
+                  <span class="section1__highlights12"
+                    ><span class="section1__highlights12_span0">Weight:</span
+                    ><span class="section1__highlights12_span1">
+                        5.2 kg<br /></span
+                    ><span class="section1__highlights12_span2"
+                      >Dimensions(WxDxH)(cm): </span
+                    ><span class="section1__highlights12_span3"
+                      >17.1 x 39.3 x 30.8<br /></span
+                    ><span class="section1__highlights12_span4">Pressure:</span
+                    ><span class="section1__highlights12_span5">
+                      19 bar<br /></span
+                    ><span class="section1__highlights12_span6"
+                      >Steam pipe for milk frothing<br />Warranty: </span
+                    ><span class="section1__highlights12_span7"
+                      >2 years</span
+                    ></span
+                  >
+                </h5>
               </div>
-            </div>
-            <div class="section1__flexCol5">
-              <div class="section1__flexCol6">
-                <div class="section1__flexRow6">
-                  <div class="cell">
-                    <h3 class="section1__subtitle1">Description</h3>
+              <div class="section1__flexCol7">
+                <h2 class="section1__medium_title1">Similar Items</h2>
+                <div class="section1__flexRow7">
+                  <div class="section1__flexCol8">
+                    <div class="cell">
+                      <img
+                        src="\src\views\partials\assets\a69a33656b1e81b196f7c3aea8146d2f.png"
+                        alt="alt text"
+                        class="section1__image2"
+                      />
+                    </div>
+                    <h3 class="section1__subtitle21">Lattissima one</h3>
+                    <h3 class="section1__subtitle3">$ 660</h3>
                   </div>
                   <div class="spacer"></div>
-                  <div class="cell1">
-                    <div class="section1__group1">
-                      <hr size="1" class="section1__line3" />
-                      <h3 class="section1__subtitle2">
-                        Additional information
-                      </h3>
+                  <div class="section1__flexCol9">
+                    <div class="cell">
+                      <img
+                        src="\src\views\partials\assets\908c65d50bdf4cb1a8b137d813491ff4.png"
+                        alt="alt text"
+                        class="section1__image5"
+                      />
                     </div>
+                    <h3 class="section1__subtitle22">Creatista Plus</h3>
+                    <h3 class="section1__subtitle3">$ 750</h3>
                   </div>
-                  <div class="spacer1"></div>
-                  <div class="cell2">
-                    <h3 class="section1__subtitle1">Reviews (79)</h3>
+                  <div class="spacer"></div>
+                  <div class="section1__flexCol8">
+                    <div class="cell1">
+                      <img
+                        src="\src\views\partials\assets\ebf0cfbfafc4138fbc0d3aa025e6dabd.png"
+                        alt="alt text"
+                        class="section1__image6"
+                      />
+                    </div>
+                    <h3 class="section1__subtitle21">Pixie</h3>
+                    <h3 class="section1__subtitle31">$ 400</h3>
                   </div>
                 </div>
-                <div class="section1__content_box1"></div>
               </div>
-              <h5 class="section1__highlights12_box">
-                <span class="section1__highlights12"><span class="section1__highlights12_span0">Weight:</span><span
-                    class="section1__highlights12_span1">
-                      5.2 kg<br /></span><span class="section1__highlights12_span2">Dimensions(WxDxH)(cm): </span><span
-                    class="section1__highlights12_span3">17.1 x 39.3 x 30.8<br /></span><span
-                    class="section1__highlights12_span4">Pressure:</span><span class="section1__highlights12_span5">
-                    19 bar<br /></span><span class="section1__highlights12_span6">Steam pipe for milk
-                    frothing<br />Warranty: </span><span class="section1__highlights12_span7">2 years</span></span>
-              </h5>
             </div>
-            <div class="section1__flexCol7">
-              <h2 class="section1__medium_title1">Similar Items</h2>
-              <div class="section1__flexRow7">
-                <div class="section1__flexCol8">
-                  <div class="cell">
-                    <img src="\src\views\partials\assets\a69a33656b1e81b196f7c3aea8146d2f.png" alt="alt text"
-                      class="section1__image2" />
-                  </div>
-                  <h3 class="section1__subtitle21">Lattissima one</h3>
-                  <h3 class="section1__subtitle3">$ 660</h3>
-                </div>
-                <div class="spacer"></div>
-                <div class="section1__flexCol9">
-                  <div class="cell">
-                    <img src="\src\views\partials\assets\908c65d50bdf4cb1a8b137d813491ff4.png" alt="alt text"
-                      class="section1__image5" />
+            <div class="section1__group2"></div>
+            <div class="section1__group3">
+              <div class="section1__content_box2">
+                <div class="section1__flexRow8">
+                  <div class="section1__flexRow9">
+                    <div class="cell">
+                      <img
+                        src="\src\views\partials\assets\29721143e926a816dec4943d6352c52e.png"
+                        alt="alt text"
+                        class="section1__icon1"
+                      />
+                    </div>
+                    <div class="spacer"></div>
+                    <h5 class="section1__highlights13">
+                      This item added to your Shopping bag.
+                    </h5>
                   </div>
-                  <h3 class="section1__subtitle22">Creatista Plus</h3>
-                  <h3 class="section1__subtitle3">$ 750</h3>
+                  <div class="spacer"></div>
+                  <h5
+                    class="section1__highlights31"
+                    onclick="alert(`It is clickable`)"
+                  >
+                    VIEW CART
+                  </h5>
                 </div>
-                <div class="spacer"></div>
-                <div class="section1__flexCol8">
-                  <div class="cell1">
-                    <img src="\src\views\partials\assets\ebf0cfbfafc4138fbc0d3aa025e6dabd.png" alt="alt text"
-                      class="section1__image6" />
-                  </div>
-                  <h3 class="section1__subtitle21">Pixie</h3>
-                  <h3 class="section1__subtitle31">$ 400</h3>
+                <div class="section1__flexCol10">
+                  <hr size="1" class="section1__line6" />
+                  <hr size="1" class="section1__line" />
                 </div>
               </div>
             </div>
-          </div>
-          <div class="section1__group2"></div>
-          <div class="section1__group3">
-            <div class="section1__content_box2">
-              <div class="section1__flexRow8">
-                <div class="section1__flexRow9">
-                  <div class="cell">
-                    <img src="\src\views\partials\assets\29721143e926a816dec4943d6352c52e.png" alt="alt text"
-                      class="section1__icon1" />
+          </section>
+          <!-- ======= End section1 ======= -->
+        </div>
+        <div class="section2">
+          <!-- prettier-ignore -->
+          <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
                   </div>
-                  <div class="spacer"></div>
-                  <h5 class="section1__highlights13">
-                    This item added to your Shopping bag.
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
                   </h5>
                 </div>
                 <div class="spacer"></div>
-                <h5 class="section1__highlights31" onclick="alert(`It is clickable`)">
-                  VIEW CART
-                </h5>
-              </div>
-              <div class="section1__flexCol10">
-                <hr size="1" class="section1__line6" />
-                <hr size="1" class="section1__line" />
-              </div>
-            </div>
-          </div>
-        </section>
-        <!-- ======= End section1 ======= -->
-      </div>
-      <div class="section2">
-        <!-- prettier-ignore -->
-        <section class="footer footer__section2">
-          <hr size="1" class="footer__line" />
-          <div class="footer__group">
-            <div class="footer__nullContent">
-              <div class="footer__flexCol">
-                <div class="footer__flexRow">
-                  <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
-                  <div class="spacer"></div>
-                  <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                  <div class="spacer1"></div>
-                  <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
-                </div>
-                <h5 class="footer__highlights_box">
-                  <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                      class="footer__highlights_span1"> Terms of use </span><span
-                      class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                      policy.</span></span>
-                </h5>
-              </div>
-              <div class="spacer"></div>
-              <div class="footer__flexCol1">
-                <br>
-                <div class="footer__flexCol2">
-                  <div class="footer__group1">
-                    <div class="footer__highlights13">
-                      <input class="form-control email-input" type="text"
-                        placeholder="Enter your email, get the newsletter!">
-                    </div>
-                    <div class="footer__image-container">
-                      <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                        alt="A clickable arrow to submit email" class="footer__image1"
-                        onclick="alert(`It is clickable`)" />
-                      <!-- Send an email with newsletter -->
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
                     </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
-                  <br><br>
-                  <hr size="1" class="footer__line1" />
                 </div>
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-            <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-              class="footer__image2" />
-          </div>
-        </section>
+          </section>
+        </div>
       </div>
-    </div>
-  </main>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-
-  <script type="text/javascript">
-    AOS.init();
-    const header = document.querySelector("#header");
-    if (header) {
-      const headroom = new Headroom(header);
-      headroom.init();
-    }
-  </script>
-</body>
+    </main>
+    <script type="text/javascript">
+      AOS.init();
 
-</html>
\ No newline at end of file
+      const header = document.querySelector("#header");
+      if (header) {
+        const headroom = new Headroom(header);
+        headroom.init();
+      }
+    </script>
+  </body>
+</html>
diff --git a/src/views/layouts/ShopPage/ShopPage.css b/src/views/layouts/ShopPage/ShopPage.css
index 738c2f7..6c7f3f9 100644
--- a/src/views/layouts/ShopPage/ShopPage.css
+++ b/src/views/layouts/ShopPage/ShopPage.css
@@ -6,13 +6,11 @@
   position: relative;
   overflow: hidden;
 }
-
-.shop-page .main>.cell {
+.shop-page .main > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .shop-page .section1__section1 {
   display: flex;
   flex-direction: column;
@@ -20,7 +18,6 @@
   flex-grow: 1;
   min-height: 1390px;
 }
-
 .shop-page .section1__flexRow {
   display: flex;
   align-items: center;
@@ -29,7 +26,6 @@
   flex-grow: 1;
   margin: 161px auto 290px;
 }
-
 .shop-page .section1__flexCol {
   display: flex;
   flex-direction: column;
@@ -37,28 +33,24 @@
   flex: 0 1 378px;
   margin: 0px 0px 447px;
 }
-
 .shop-page .section1__title {
   font: 500 33px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 .shop-page .section1__flexCol1 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 41px 26px 0px 0px;
 }
-
 .shop-page .section1__group {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 0px 3px 0px 0px;
 }
-
 .shop-page .section1__image7 {
   width: 21px;
   height: auto;
@@ -70,42 +62,36 @@
   top: 2px;
   right: 1px;
 }
-
 .shop-page .section1__flexCol2 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .shop-page .section1__text1 {
   font: 400 14px/1.57 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
   letter-spacing: 0px;
   position: relative;
 }
-
 .shop-page .section1__line1 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 11px 0px 0px;
 }
-
 .shop-page .section1__flexCol3 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 37px 1px 0px 2px;
 }
-
-.shop-page .section1__flexCol3>.cell {
+.shop-page .section1__flexCol3 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 2;
 }
-
 .shop-page .section1__rect1 {
   border-radius: 4px 4px 4px 4px;
   outline: 1px solid rgb(216, 216, 216);
@@ -114,15 +100,13 @@
   flex-grow: 1;
   min-height: 53px;
 }
-
-.shop-page .section1__flexCol3>.cell1 {
+.shop-page .section1__flexCol3 > .cell1 {
   margin-top: -37px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 0;
 }
-
 .shop-page .section1__text {
   font: 400 14px/1.57 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -131,15 +115,13 @@
   flex-grow: 1;
   margin: 0px 16px;
 }
-
-.shop-page .section1__flexCol3>.cell2 {
+.shop-page .section1__flexCol3 > .cell2 {
   margin-top: -15px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 4;
 }
-
 .shop-page .section1__image4 {
   width: 100%;
   height: 100%;
@@ -149,14 +131,12 @@
   object-fit: cover;
   object-position: center center;
 }
-
-.shop-page .section1__flexCol3>.cell3 {
+.shop-page .section1__flexCol3 > .cell3 {
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 3;
 }
-
 .shop-page .section1__rect11 {
   border-radius: 4px 4px 4px 4px;
   outline: 1px solid rgb(216, 216, 216);
@@ -166,37 +146,32 @@
   min-height: 53px;
   margin: 39px 0px 0px;
 }
-
-.shop-page .section1__flexCol3>.cell4 {
+.shop-page .section1__flexCol3 > .cell4 {
   margin-top: -38px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 1;
 }
-
-.shop-page .section1__flexCol3>.cell5 {
+.shop-page .section1__flexCol3 > .cell5 {
   margin-top: -15px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 5;
 }
-
 .shop-page .section1__flexCol4 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 39px 0px 0px 2px;
 }
-
-.shop-page .section1__flexCol4>.cell {
+.shop-page .section1__flexCol4 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 1;
 }
-
 .shop-page .section1__rect2 {
   background-color: rgb(0, 0, 0);
   width: 0.57%;
@@ -205,15 +180,13 @@
   min-height: 10px;
   margin: 0px 0% 0px 99.43%;
 }
-
-.shop-page .section1__flexCol4>.cell1 {
+.shop-page .section1__flexCol4 > .cell1 {
   margin-top: -10px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 2;
 }
-
 .shop-page .section1__rect21 {
   background-color: rgb(0, 0, 0);
   width: 0.57%;
@@ -222,15 +195,13 @@
   min-height: 10px;
   margin: 0px 80.86% 0px 18.57%;
 }
-
-.shop-page .section1__flexCol4>.cell2 {
+.shop-page .section1__flexCol4 > .cell2 {
   margin-top: -6px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 3;
 }
-
 .shop-page .section1__flexCol5 {
   display: flex;
   flex-direction: column;
@@ -238,13 +209,11 @@
   flex-grow: 1;
   margin: 0px 1px 0px 0px;
 }
-
-.shop-page .section1__flexCol5>.cell {
+.shop-page .section1__flexCol5 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .shop-page .section1__image6 {
   width: calc(100% - 0px);
   height: auto;
@@ -254,7 +223,6 @@
   object-position: center center;
   position: relative;
 }
-
 .shop-page .section1__text11 {
   font: 400 14px/1.57 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -262,15 +230,13 @@
   position: relative;
   margin: 11px 0px 0px;
 }
-
-.shop-page .section1__flexCol4>.cell3 {
+.shop-page .section1__flexCol4 > .cell3 {
   margin-top: -35px;
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 0;
 }
-
 .shop-page .section1__line {
   background-color: rgb(0, 0, 0);
   width: 81.14%;
@@ -278,14 +244,12 @@
   position: relative;
   margin: 0px 0% 0px 18.86%;
 }
-
-.shop-page .section1__flexCol4>.cell4 {
+.shop-page .section1__flexCol4 > .cell4 {
   display: flex;
   flex-direction: column;
   position: relative;
   z-index: 4;
 }
-
 .shop-page .section1__text2 {
   display: flex;
   justify-content: flex-end;
@@ -297,21 +261,18 @@
   flex-grow: 1;
   margin: 11px 0px 0px;
 }
-
 .shop-page .section1__flexRow1 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 39px 2px 0px;
 }
-
 .shop-page .section1__flexCol6 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 78px;
 }
-
 .shop-page .section1__highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -319,7 +280,6 @@
   position: relative;
   margin: 0px 3px 0px 0px;
 }
-
 .shop-page .section1__highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -327,11 +287,9 @@
   position: relative;
   margin: 42px 0px 0px;
 }
-
-.shop-page .section1__flexRow1>.spacer {
+.shop-page .section1__flexRow1 > .spacer {
   flex: 0 1 236px;
 }
-
 .shop-page .section1__flexCol7 {
   display: flex;
   flex-direction: column;
@@ -339,13 +297,11 @@
   flex: 0 1 33px;
   margin: 3px 0px;
 }
-
-.shop-page .section1__flexCol7>.cell {
+.shop-page .section1__flexCol7 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .shop-page .section1__image5 {
   width: 33px;
   height: auto;
@@ -357,7 +313,6 @@
   position: relative;
   min-width: 33px;
 }
-
 .shop-page .section1__image51 {
   width: 33px;
   height: auto;
@@ -370,12 +325,10 @@
   min-width: 33px;
   margin: 50px 0px 0px;
 }
-
-.shop-page .section1__flexRow>.spacer {
+.shop-page .section1__flexRow > .spacer {
   flex: 0 0 57px;
   min-width: 57px;
 }
-
 .shop-page .section1__flexRow2 {
   display: flex;
   align-items: center;
@@ -383,15 +336,13 @@
   flex: 0 1 1195px;
   margin: 84px 0px 0px;
 }
-
-.shop-page .section1__flexRow2>.cell {
+.shop-page .section1__flexRow2 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 378px;
   z-index: 2;
 }
-
 .shop-page .section1__flexCol8 {
   display: flex;
   flex-direction: column;
@@ -402,17 +353,14 @@
   flex-grow: 1;
   margin: 462px 0px 1px;
 }
-
 .shop-page .section1__flexCol8:hover {
   transform: scale(1.1);
 }
-
-.shop-page .section1__flexCol8>.cell {
+.shop-page .section1__flexCol8 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .shop-page .section1__image2 {
   width: calc(100% - 0px);
   height: auto;
@@ -423,7 +371,6 @@
   object-position: center center;
   position: relative;
 }
-
 .shop-page .section1__subtitle {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -431,7 +378,6 @@
   position: relative;
   margin: 24px 0px 0px;
 }
-
 .shop-page .section1__subtitle1 {
   font: 500 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -439,8 +385,7 @@
   position: relative;
   margin: 16px 0px 0px;
 }
-
-.shop-page .section1__flexRow2>.cell1 {
+.shop-page .section1__flexRow2 > .cell1 {
   margin-left: -378px;
   display: flex;
   flex-direction: column;
@@ -448,7 +393,6 @@
   flex: 0 1 378px;
   z-index: 4;
 }
-
 .shop-page .section1__flexCol9 {
   display: flex;
   flex-direction: column;
@@ -459,11 +403,9 @@
   flex-grow: 1;
   margin: 0px 0px 463px;
 }
-
 .shop-page .section1__flexCol9:hover {
   transform: scale(1.1);
 }
-
 .shop-page .section1__content_box1 {
   display: flex;
   flex-direction: column;
@@ -471,7 +413,6 @@
   cursor: pointer;
   position: relative;
 }
-
 .shop-page .section1__content_box {
   display: flex;
   flex-direction: column;
@@ -482,7 +423,6 @@
   flex-grow: 1;
   margin: 16px 79.37% 260px 5.29%;
 }
-
 .shop-page .section1__info {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(255, 255, 255);
@@ -491,7 +431,6 @@
   flex-grow: 1;
   margin: 2px 5px 2px 10px;
 }
-
 .shop-page .section1__flexCol10 {
   display: flex;
   flex-direction: column;
@@ -499,18 +438,15 @@
   position: relative;
   margin: 24px 45.77% 0px 0%;
 }
-
 .shop-page .section1__subtitle2 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
-.shop-page .section1__flexRow2>.spacer {
+.shop-page .section1__flexRow2 > .spacer {
   flex: 1 1 50px;
 }
-
 .shop-page .section1__flexCol11 {
   display: flex;
   flex-direction: column;
@@ -521,17 +457,14 @@
   flex: 0 1 379px;
   margin: 0px 0px 463px;
 }
-
 .shop-page .section1__flexCol11:hover {
   transform: scale(1.1);
 }
-
-.shop-page .section1__flexCol11>.cell {
+.shop-page .section1__flexCol11 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .shop-page .section1__image {
   width: calc(100% - 0px);
   height: auto;
@@ -542,8 +475,7 @@
   object-position: center center;
   position: relative;
 }
-
-.shop-page .section1__flexRow2>.cell2 {
+.shop-page .section1__flexRow2 > .cell2 {
   margin-left: -379px;
   display: flex;
   flex-direction: column;
@@ -551,7 +483,6 @@
   flex: 0 1 379px;
   z-index: 5;
 }
-
 .shop-page .section1__flexCol12 {
   display: flex;
   flex-direction: column;
@@ -562,11 +493,9 @@
   flex-grow: 1;
   margin: 462px 0px 0px;
 }
-
 .shop-page .section1__flexCol12:hover {
   transform: scale(1.1);
 }
-
 .shop-page .section1__content_box3 {
   display: flex;
   flex-direction: column;
@@ -574,7 +503,6 @@
   cursor: pointer;
   position: relative;
 }
-
 .shop-page .section1__content_box2 {
   display: flex;
   flex-direction: column;
@@ -585,7 +513,6 @@
   flex-grow: 1;
   margin: 16px 81.53% 260px 2.11%;
 }
-
 .shop-page .section1__info1 {
   font: 400 12px/1.66 "DM Sans", Helvetica, Arial, serif;
   color: rgb(255, 255, 255);
@@ -594,7 +521,6 @@
   flex-grow: 1;
   margin: 2px 6px 2px 8px;
 }
-
 .shop-page .section1__subtitle11 {
   font: 500 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(161, 138, 104);
@@ -602,15 +528,13 @@
   position: relative;
   margin: 17px 0px 0px;
 }
-
-.shop-page .section1__flexRow2>.cell3 {
+.shop-page .section1__flexRow2 > .cell3 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 378px;
   z-index: 1;
 }
-
 .shop-page .section1__image1 {
   width: calc(100% - 0px);
   height: auto;
@@ -624,12 +548,10 @@
   position: relative;
   margin: 0px 0px 463px;
 }
-
 .shop-page .section1__image1:hover {
   transform: scale(1.1);
 }
-
-.shop-page .section1__flexRow2>.cell4 {
+.shop-page .section1__flexRow2 > .cell4 {
   margin-left: -378px;
   display: flex;
   flex-direction: column;
@@ -637,13 +559,11 @@
   flex: 0 1 378px;
   z-index: 3;
 }
-
-.shop-page .section1__flexCol8>.cell1 {
+.shop-page .section1__flexCol8 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .shop-page .section1__image3 {
   width: calc(100% - 0px);
   height: auto;
@@ -654,7 +574,6 @@
   object-position: center center;
   position: relative;
 }
-
 .shop-page .section2 {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/ShopPage/ShopPage.html b/src/views/layouts/ShopPage/ShopPage.html
index e35ba18..41d8e36 100644
--- a/src/views/layouts/ShopPage/ShopPage.html
+++ b/src/views/layouts/ShopPage/ShopPage.html
@@ -1,281 +1,369 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <!-- Font Awesome is an icon library -->
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
-  <!-- 'Animate On Scroll' library -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <!-- Bootstrap linker -->
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\ShopPage\ShopPage.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
 
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+    <script src="https://cdn.jsdelivr.net/gh/px2code/posize/build/v1.01.0.js"></script>
+  </head>
 
-  <link rel="stylesheet" type="text/css" href="\src\views\layouts\ShopPage\ShopPage.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Header\Header0.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Footer\Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/gh/px2code/posize/build/v1.01.0.js"></script>
-</head>
-
-<body class="flex-column">
-  <header id="header" class="headroom">
-    <nav class="max:show">
-      <!-- prettier-ignore -->
-      <div class="header0 header0__group1">
-        <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
-          <div class="spacer"></div>
-          <div class="header0__box">
-            <div class="header0__flexRow1">
-              <div class="cell">
-                <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr">
-                  <div class="header0__txt" onclick="window.location.href='/src/views/layouts/ShopPage/ShopPage.html'">
-                    Shop</div>
-                </px-grid>
-              </div>
-              <div class="cell1">
-                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
-              </div>
+  <body class="flex-column">
+    <header id="header" class="headroom">
+      <nav class="max:show">
+        <!-- prettier-ignore -->
+        <div class="header0 header0__group1">
+            <div class="header0__flexRow">
+              <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
               <div class="spacer"></div>
-              <div class="header0__rect5"></div>
-              <div class="spacer1"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" onclick="alert(`It is clickable`)" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell3">
-                <img src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png" alt="alt text"
-                  class="header0__icon1" onclick="window.location.href='/src/views/layouts/Cart/Cart.html'" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="alert(`It is clickable`)" />
+              <div class="header0__box">
+                <div class="header0__flexRow1">
+                  <div class="cell">
+                    <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr"
+                      ><div class="header0__txt" onclick="alert(`It is clickable`)">Shop</div></px-grid
+                    >
+                  </div>
+                  <div class="cell1"><h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4></div>
+                  <div class="spacer"></div>
+                  <div class="header0__rect5"></div>
+                  <div class="spacer1"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png"
+                      alt="alt text"
+                      class="header0__image10"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell3">
+                    <img
+                      src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png"
+                      alt="alt text"
+                      class="header0__icon1"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <div class="spacer2"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png"
+                      alt="alt text"
+                      class="header0__icon"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                </div>
               </div>
             </div>
           </div>
-        </div>
-      </div>
-    </nav>
-  </header>
-
-  <main class="shop-page main">
-    <div class="cell">
-      <!-- ======= section1 ======= -->
-      <section class="section1__section1">
-        <div class="section1__flexRow">
-          <div class="section1__flexCol">
-            <h1 class="section1__title">Shop The Latest</h1>
-            <div class="section1__flexCol1">
-              <div class="section1__group">
-                <img src="\src\views\partials\assets\7b5320c4022bb8608c293d2d88bb1e61.png" alt="alt text"
-                  class="section1__image7" />
-                <div class="section1__flexCol2">
-                  <div class="section1__text1">Search...</div>
-                  <hr size="1" class="section1__line1" />
-                </div>
-              </div>
-              <div class="section1__flexCol3">
-                <div class="cell">
-                  <div class="section1__rect1"></div>
-                </div>
-                <div class="cell1">
-                  <div class="section1__text">Shop By</div>
-                </div>
-                <div class="cell2">
-                  <px-grid track-style="flex-grow: 1;" x="314fr 19px 16fr" y="0px minmax(0px, max-content) 0px"><img
-                      class="section1__image4" src="\src\views\partials\assets\fbd99ef7f9fd42c75081c7ba23d60380.png"
-                      alt="alt text" onclick="alert(`It is clickable`)" /></px-grid>
-                </div>
-                <div class="cell3">
-                  <div class="section1__rect11"></div>
-                </div>
-                <div class="cell4">
-                  <div class="section1__text">Sort By</div>
-                </div>
-                <div class="cell5">
-                  <px-grid track-style="flex-grow: 1;" x="314fr 19px 16fr" y="0px minmax(0px, max-content) 0px"><img
-                      class="section1__image4" src="\src\views\partials\assets\fbd99ef7f9fd42c75081c7ba23d60380.png"
-                      alt="alt text" onclick="alert(`It is clickable`)" /></px-grid>
-                </div>
-              </div>
-              <div class="section1__flexCol4">
-                <div class="cell">
-                  <div class="section1__rect2"></div>
+      </nav>
+    </header>
+    <main class="shop-page main">
+      <div class="cell">
+        <!-- ======= section1 ======= -->
+        <section class="section1__section1">
+          <div class="section1__flexRow">
+            <div class="section1__flexCol">
+              <h1 class="section1__title">Shop The Latest</h1>
+              <div class="section1__flexCol1">
+                <div class="section1__group">
+                  <img
+                    src="\src\views\partials\assets\7b5320c4022bb8608c293d2d88bb1e61.png"
+                    alt="alt text"
+                    class="section1__image7"
+                  />
+                  <div class="section1__flexCol2">
+                    <div class="section1__text1">Search...</div>
+                    <hr size="1" class="section1__line1" />
+                  </div>
                 </div>
-                <div class="cell1">
-                  <div class="section1__rect21"></div>
+                <div class="section1__flexCol3">
+                  <div class="cell"><div class="section1__rect1"></div></div>
+                  <div class="cell1">
+                    <div class="section1__text">Shop By</div>
+                  </div>
+                  <div class="cell2">
+                    <px-grid
+                      track-style="flex-grow: 1;"
+                      x="314fr 19px 16fr"
+                      y="0px minmax(0px, max-content) 0px"
+                      ><img
+                        class="section1__image4"
+                        src="\src\views\partials\assets\fbd99ef7f9fd42c75081c7ba23d60380.png"
+                        alt="alt text"
+                        onclick="alert(`It is clickable`)"
+                    /></px-grid>
+                  </div>
+                  <div class="cell3"><div class="section1__rect11"></div></div>
+                  <div class="cell4">
+                    <div class="section1__text">Sort By</div>
+                  </div>
+                  <div class="cell5">
+                    <px-grid
+                      track-style="flex-grow: 1;"
+                      x="314fr 19px 16fr"
+                      y="0px minmax(0px, max-content) 0px"
+                      ><img
+                        class="section1__image4"
+                        src="\src\views\partials\assets\fbd99ef7f9fd42c75081c7ba23d60380.png"
+                        alt="alt text"
+                        onclick="alert(`It is clickable`)"
+                    /></px-grid>
+                  </div>
                 </div>
-                <div class="cell2">
-                  <div class="section1__flexCol5">
-                    <div class="cell">
-                      <img src="\src\views\partials\assets\f70ee40f98a3a895ecb2450f65325f10.png" alt="alt text"
-                        class="section1__image6" />
+                <div class="section1__flexCol4">
+                  <div class="cell"><div class="section1__rect2"></div></div>
+                  <div class="cell1"><div class="section1__rect21"></div></div>
+                  <div class="cell2">
+                    <div class="section1__flexCol5">
+                      <div class="cell">
+                        <img
+                          src="\src\views\partials\assets\f70ee40f98a3a895ecb2450f65325f10.png"
+                          alt="alt text"
+                          class="section1__image6"
+                        />
+                      </div>
+                      <div class="section1__text11">Price: $300 - $1500</div>
                     </div>
-                    <div class="section1__text11">Price: $300 - $1500</div>
+                  </div>
+                  <div class="cell3">
+                    <hr size="1" class="section1__line" />
+                  </div>
+                  <div class="cell4">
+                    <div class="section1__text2">Filter</div>
                   </div>
                 </div>
-                <div class="cell3">
-                  <hr size="1" class="section1__line" />
-                </div>
-                <div class="cell4">
-                  <div class="section1__text2">Filter</div>
-                </div>
-              </div>
-              <div class="section1__flexRow1">
-                <div class="section1__flexCol6">
-                  <h5 class="section1__highlights">On sale</h5>
-                  <h5 class="section1__highlights1">In stock</h5>
-                </div>
-                <div class="spacer"></div>
-                <div class="section1__flexCol7">
-                  <div class="cell">
-                    <img src="\src\views\partials\assets\5f39f909f1670812e2ef9abe3b09163a.png" alt="alt text"
-                      class="section1__image5" onclick="alert(`It is clickable`)" />
+                <div class="section1__flexRow1">
+                  <div class="section1__flexCol6">
+                    <h5 class="section1__highlights">On sale</h5>
+                    <h5 class="section1__highlights1">In stock</h5>
                   </div>
-                  <div class="cell">
-                    <img src="\src\views\partials\assets\5f39f909f1670812e2ef9abe3b09163a.png" alt="alt text"
-                      class="section1__image51" onclick="alert(`It is clickable`)" />
+                  <div class="spacer"></div>
+                  <div class="section1__flexCol7">
+                    <div class="cell">
+                      <img
+                        src="\src\views\partials\assets\5f39f909f1670812e2ef9abe3b09163a.png"
+                        alt="alt text"
+                        class="section1__image5"
+                        onclick="alert(`It is clickable`)"
+                      />
+                    </div>
+                    <div class="cell">
+                      <img
+                        src="\src\views\partials\assets\5f39f909f1670812e2ef9abe3b09163a.png"
+                        alt="alt text"
+                        class="section1__image51"
+                        onclick="alert(`It is clickable`)"
+                      />
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
-          <div class="spacer"></div>
-          <div class="section1__flexRow2" data-aos="fade-up">
-            <div class="cell">
-              <div class="section1__flexCol8" onclick="alert(`It is clickable`)">
-                <div class="cell">
-                  <img src="\src\views\partials\assets\1eef544168a037e4a08cce2cbbf47d86.png" alt="alt text"
-                    class="section1__image2" onclick="alert(`It is clickable`)" />
+            <div class="spacer"></div>
+            <div class="section1__flexRow2" data-aos="fade-up">
+              <div class="cell">
+                <div
+                  class="section1__flexCol8"
+                  onclick="alert(`It is clickable`)"
+                >
+                  <div class="cell">
+                    <img
+                      src="\src\views\partials\assets\1eef544168a037e4a08cce2cbbf47d86.png"
+                      alt="alt text"
+                      class="section1__image2"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <h3 class="section1__subtitle">Lattissima one</h3>
+                  <h3 class="section1__subtitle1">$ 660</h3>
                 </div>
-                <h3 class="section1__subtitle">Lattissima one</h3>
-                <h3 class="section1__subtitle1">$ 660</h3>
               </div>
-            </div>
-            <div class="cell1">
-              <div class="section1__flexCol9" onclick="alert(`It is clickable`)">
-                <div style="
+              <div class="cell1">
+                <div
+                  class="section1__flexCol9"
+                  onclick="alert(`It is clickable`)"
+                >
+                  <div
+                    style="
                       --src: url(\src\views\partials\assets\373b6af1c8dcfddc3169464dae0c165e.png);
-                    " class="section1__content_box1" onclick="alert(`It is clickable`)">
-                  <div class="section1__content_box">
-                    <div class="section1__info">- %20</div>
+                    "
+                    class="section1__content_box1"
+                    onclick="alert(`It is clickable`)"
+                  >
+                    <div class="section1__content_box">
+                      <div class="section1__info">- %20</div>
+                    </div>
+                  </div>
+                  <div class="section1__flexCol10">
+                    <h3 class="section1__subtitle2">Nespresso Atelier</h3>
+                    <h3 class="section1__subtitle1">$ 550</h3>
                   </div>
-                </div>
-                <div class="section1__flexCol10">
-                  <h3 class="section1__subtitle2">Nespresso Atelier</h3>
-                  <h3 class="section1__subtitle1">$ 550</h3>
                 </div>
               </div>
-            </div>
-            <div class="spacer"></div>
-            <div class="section1__flexCol11" onclick="alert(`It is clickable`)">
-              <div class="cell">
-                <img src="\src\views\partials\assets\9d9f68ed2e69fe48a36b39fe02c20e0f.png" alt="alt text"
-                  class="section1__image" onclick="alert(`It is clickable`)" />
+              <div class="spacer"></div>
+              <div
+                class="section1__flexCol11"
+                onclick="alert(`It is clickable`)"
+              >
+                <div class="cell">
+                  <img
+                    src="\src\views\partials\assets\9d9f68ed2e69fe48a36b39fe02c20e0f.png"
+                    alt="alt text"
+                    class="section1__image"
+                    onclick="alert(`It is clickable`)"
+                  />
+                </div>
+                <h3 class="section1__subtitle">CitiZ</h3>
+                <h3 class="section1__subtitle1">$ 350</h3>
               </div>
-              <h3 class="section1__subtitle">CitiZ</h3>
-              <h3 class="section1__subtitle1">$ 350</h3>
-            </div>
-            <div class="cell2">
-              <div class="section1__flexCol12" onclick="alert(`It is clickable`)">
-                <div style="
+              <div class="cell2">
+                <div
+                  class="section1__flexCol12"
+                  onclick="alert(`It is clickable`)"
+                >
+                  <div
+                    style="
                       --src: url(\src\views\partials\assets\a9c7eb1de574413083ee6a0052b6c542.png);
-                    " class="section1__content_box3" onclick="alert(`It is clickable`)">
-                  <div class="section1__content_box2">
-                    <div class="section1__info1">Sold out</div>
+                    "
+                    class="section1__content_box3"
+                    onclick="alert(`It is clickable`)"
+                  >
+                    <div class="section1__content_box2">
+                      <div class="section1__info1">Sold out</div>
+                    </div>
                   </div>
+                  <h3 class="section1__subtitle">Pixie</h3>
+                  <h3 class="section1__subtitle11">$ 400</h3>
                 </div>
-                <h3 class="section1__subtitle">Pixie</h3>
-                <h3 class="section1__subtitle11">$ 400</h3>
               </div>
-            </div>
-            <div class="spacer"></div>
-            <div class="cell3">
-              <img src="\src\views\partials\assets\1e9c3112bb41a86f4438722dcbfc0752.png" alt="alt text"
-                class="section1__image1" onclick="alert(`It is clickable`)" />
-            </div>
-            <div class="cell4">
-              <div class="section1__flexCol8" onclick="alert(`It is clickable`)">
-                <div class="cell1">
-                  <img src="\src\views\partials\assets\0b7472f22e8a70a6a61fadb5a70c514f.png" alt="alt text"
-                    class="section1__image3" onclick="alert(`It is clickable`)" />
+              <div class="spacer"></div>
+              <div class="cell3">
+                <img
+                  src="\src\views\partials\assets\1e9c3112bb41a86f4438722dcbfc0752.png"
+                  alt="alt text"
+                  class="section1__image1"
+                  onclick="alert(`It is clickable`)"
+                />
+              </div>
+              <div class="cell4">
+                <div
+                  class="section1__flexCol8"
+                  onclick="alert(`It is clickable`)"
+                >
+                  <div class="cell1">
+                    <img
+                      src="\src\views\partials\assets\0b7472f22e8a70a6a61fadb5a70c514f.png"
+                      alt="alt text"
+                      class="section1__image3"
+                      onclick="alert(`It is clickable`)"
+                    />
+                  </div>
+                  <h3 class="section1__subtitle2">Creatista Plus</h3>
+                  <h3 class="section1__subtitle1">$ 750</h3>
                 </div>
-                <h3 class="section1__subtitle2">Creatista Plus</h3>
-                <h3 class="section1__subtitle1">$ 750</h3>
               </div>
             </div>
           </div>
-        </div>
-      </section>
-      <!-- ======= End section1 ======= -->
-    </div>
-    <div class="section2">
-      <!-- prettier-ignore -->
-      <section class="footer footer__section2">
-        <hr size="1" class="footer__line" />
-        <div class="footer__group">
-          <div class="footer__nullContent">
-            <div class="footer__flexCol">
-              <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
-                <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
-              </div>
-              <h5 class="footer__highlights_box">
-                <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                    class="footer__highlights_span1"> Terms of use </span><span
-                    class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                    policy.</span></span>
-              </h5>
-            </div>
-            <div class="spacer"></div>
-            <div class="footer__flexCol1">
-              <br>
-              <div class="footer__flexCol2">
-                <div class="footer__group1">
-                  <div class="footer__highlights13">
-                    <input class="form-control email-input" type="text"
-                      placeholder="Enter your email, get the newsletter!">
+        </section>
+        <!-- ======= End section1 ======= -->
+      </div>
+      <div class="section2">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
                   </div>
-                  <div class="footer__image-container">
-                    <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                      alt="A clickable arrow to submit email" class="footer__image1"
-                      onclick="alert(`It is clickable`)" />
-                    <!-- Send an email with newsletter -->
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
+                <div class="spacer"></div>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
                 </div>
-                <br><br>
-                <hr size="1" class="footer__line1" />
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-          </div>
-          <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-            class="footer__image2" />
-        </div>
-      </section>
-    </div>
-  </main>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-  <script type="text/javascript">
-    AOS.init();
-    const header = document.querySelector("#header");
-    if (header) {
-      const headroom = new Headroom(header);
-      headroom.init();
-    }
-  </script>
-</body>
+          </section>
+      </div>
+    </main>
+    <script type="text/javascript">
+      AOS.init();
 
-</html>
\ No newline at end of file
+      const header = document.querySelector("#header");
+      if (header) {
+        const headroom = new Headroom(header);
+        headroom.init();
+      }
+    </script>
+  </body>
+</html>
diff --git a/src/views/layouts/ViewOrder/ViewOrder.css b/src/views/layouts/ViewOrder/ViewOrder.css
index 4aeb132..28af816 100644
--- a/src/views/layouts/ViewOrder/ViewOrder.css
+++ b/src/views/layouts/ViewOrder/ViewOrder.css
@@ -6,20 +6,17 @@
   position: relative;
   overflow: hidden;
 }
-
-.view-order .main>.cell {
+.view-order .main > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .view-order .section1__section1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex-grow: 1;
 }
-
 .view-order .section1__flexCol {
   display: flex;
   flex-direction: column;
@@ -28,61 +25,51 @@
   flex-grow: 1;
   margin: 220px auto 536px;
 }
-
 @media (max-width: 1919px) {
   .view-order .section1__flexCol {
     width: 86.95%;
   }
 }
-
 @media (max-width: 1399px) {
   .view-order .section1__flexCol {
     width: 89.89%;
   }
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__flexCol {
     width: 92.22%;
   }
 }
-
 @media (max-width: 991px) {
   .view-order .section1__flexCol {
     width: 94.05%;
   }
 }
-
 @media (max-width: 767px) {
   .view-order .section1__flexCol {
     width: 95.47%;
   }
 }
-
 @media (max-width: 575px) {
   .view-order .section1__flexCol {
     width: 96.56%;
   }
 }
-
 @media (max-width: 479px) {
   .view-order .section1__flexCol {
     width: 97.4%;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__flexCol {
     width: 98.04%;
   }
 }
-
 .view-order .section1__flexRow {
   display: flex;
   align-items: center;
   position: relative;
 }
-
 .view-order .section1__subtitle {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -92,24 +79,20 @@
   flex: 0 0 auto;
   min-width: 102px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__subtitle {
     font-size: 16px;
     text-align: left;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__subtitle {
     font-size: 12px;
   }
 }
-
-.view-order .section1__flexRow>.spacer {
+.view-order .section1__flexRow > .spacer {
   flex: 0 1 88px;
 }
-
 .view-order .section1__group {
   display: flex;
   flex-direction: column;
@@ -117,7 +100,6 @@
   flex: 0 0 auto;
   min-width: 64px;
 }
-
 .view-order .section1__line1 {
   background-color: rgb(0, 0, 0);
   height: 1px;
@@ -126,7 +108,6 @@
   left: -7px;
   right: -11px;
 }
-
 .view-order .section1__subtitle1 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -134,20 +115,17 @@
   position: relative;
   flex-grow: 1;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__subtitle1 {
     font-size: 16px;
     text-align: left;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__subtitle1 {
     font-size: 12px;
   }
 }
-
 .view-order .section1__subtitle2 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -157,20 +135,17 @@
   flex: 0 0 auto;
   min-width: 98px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__subtitle2 {
     font-size: 16px;
     text-align: left;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__subtitle2 {
     font-size: 12px;
   }
 }
-
 .view-order .section1__subtitle3 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -180,20 +155,17 @@
   flex: 0 0 auto;
   min-width: 145px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__subtitle3 {
     font-size: 16px;
     text-align: left;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__subtitle3 {
     font-size: 12px;
   }
 }
-
 .view-order .section1__subtitle4 {
   font: 400 20px/1.3 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -203,34 +175,29 @@
   flex: 0 0 auto;
   min-width: 65px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__subtitle4 {
     font-size: 16px;
     text-align: left;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__subtitle4 {
     font-size: 12px;
   }
 }
-
 .view-order .section1__line {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 34px 0px 0px 4px;
 }
-
 .view-order .section1__flexRow1 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 62px 0px 0px 4px;
 }
-
 .view-order .section1__flexCol1 {
   display: flex;
   flex-direction: column;
@@ -238,47 +205,40 @@
   flex: 0 1 648px;
   margin: 0px 0px 84px;
 }
-
 .view-order .section1__medium_title1 {
   font: 400 26px/1.34 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 @media (max-width: 991px) {
   .view-order .section1__medium_title1 {
     font-size: 20px;
     text-align: left;
   }
 }
-
 @media (max-width: 767px) {
   .view-order .section1__medium_title1 {
     font-size: 16px;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__medium_title1 {
     font-size: 12px;
   }
 }
-
 .view-order .section1__flexRow2 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 29px 0px 0px;
 }
-
 .view-order .section1__flexCol2 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 283px;
 }
-
 .view-order .section1__flexCol3 {
   display: flex;
   flex-direction: column;
@@ -286,21 +246,18 @@
   position: relative;
   margin: 0px 45.94% 0px 0%;
 }
-
 .view-order .section1__highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__highlights2 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -308,14 +265,12 @@
   position: relative;
   margin: 6px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights2 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__flexCol4 {
   display: flex;
   flex-direction: column;
@@ -323,14 +278,12 @@
   position: relative;
   margin: 39px 16.96% 0px 0%;
 }
-
 .view-order .section1__flexCol5 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 39px 0px 0px;
 }
-
 .view-order .section1__flexCol6 {
   display: flex;
   flex-direction: column;
@@ -338,7 +291,6 @@
   position: relative;
   margin: 39px 57.6% 0px 0%;
 }
-
 .view-order .section1__highlights21 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -346,18 +298,15 @@
   position: relative;
   margin: 6px 4px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights21 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow2>.spacer {
+.view-order .section1__flexRow2 > .spacer {
   flex: 1 1 174px;
 }
-
 .view-order .section1__flexCol7 {
   display: flex;
   flex-direction: column;
@@ -365,20 +314,17 @@
   flex: 0 1 191px;
   margin: 0px 0px 4px;
 }
-
 .view-order .section1__flexCol8 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 0px 10px 0px 0px;
 }
-
 @media (max-width: 991px) {
   .view-order .section1__flexCol8 {
     margin: 0px 4px 0px 0px;
   }
 }
-
 .view-order .section1__highlights22 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -386,26 +332,22 @@
   position: relative;
   margin: 6px 14px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights22 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 @media (max-width: 991px) {
   .view-order .section1__highlights22 {
     margin: 6px 8px 0px 0px;
   }
 }
-
 @media (max-width: 479px) {
   .view-order .section1__highlights22 {
     margin: 6px 4px 0px 0px;
   }
 }
-
 .view-order .section1__highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -413,14 +355,12 @@
   position: relative;
   margin: 0px 6px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights1 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__highlights23 {
   font: 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -429,27 +369,23 @@
   min-height: 141px;
   margin: 6px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights23 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__flexCol9 {
   display: flex;
   flex-direction: column;
   position: relative;
   margin: 24px 11px 0px 0px;
 }
-
 @media (max-width: 767px) {
   .view-order .section1__flexCol9 {
     margin: 24px 4px 0px 0px;
   }
 }
-
 .view-order .section1__highlights24 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -457,7 +393,6 @@
   position: relative;
   margin: 2px 12px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights24 {
     font-size: 12px;
@@ -465,50 +400,42 @@
     margin: 2px 8px 0px 0px;
   }
 }
-
 @media (max-width: 575px) {
   .view-order .section1__highlights24 {
     margin: 2px 4px 0px 0px;
   }
 }
-
-.view-order .section1__flexRow1>.spacer {
+.view-order .section1__flexRow1 > .spacer {
   flex: 1 1 206px;
 }
-
 .view-order .section1__flexCol10 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 742px;
 }
-
 .view-order .section1__medium_title {
   font: 26px/0.96 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
   position: relative;
 }
-
 @media (max-width: 991px) {
   .view-order .section1__medium_title {
     font-size: 20px;
     text-align: left;
   }
 }
-
 @media (max-width: 767px) {
   .view-order .section1__medium_title {
     font-size: 16px;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__medium_title {
     font-size: 12px;
   }
 }
-
 .view-order .section1__content_box {
   display: flex;
   flex-direction: column;
@@ -516,7 +443,6 @@
   position: relative;
   margin: 39px 0px 0px;
 }
-
 .view-order .section1__flexCol11 {
   display: flex;
   flex-direction: column;
@@ -525,31 +451,26 @@
   flex-grow: 1;
   margin: 39px auto;
 }
-
 @media (max-width: 767px) {
   .view-order .section1__flexCol11 {
     width: 83.92%;
   }
 }
-
 @media (max-width: 575px) {
   .view-order .section1__flexCol11 {
     width: 87.44%;
   }
 }
-
 @media (max-width: 479px) {
   .view-order .section1__flexCol11 {
     width: 90.27%;
   }
 }
-
 @media (max-width: 383px) {
   .view-order .section1__flexCol11 {
     width: 92.52%;
   }
 }
-
 .view-order .section1__highlights3 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -558,18 +479,15 @@
   flex: 0 0 auto;
   min-width: 94px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights3 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow>.spacer1 {
+.view-order .section1__flexRow > .spacer1 {
   flex: 0 1 449px;
 }
-
 .view-order .section1__highlights4 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -578,28 +496,24 @@
   flex: 0 0 auto;
   min-width: 48px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights4 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__line2 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 17px 0px 0px;
 }
-
 .view-order .section1__flexRow3 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 21px 0px 0px;
 }
-
 .view-order .section1__highlights11 {
   font: 400 16px/1.62 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -609,18 +523,15 @@
   min-width: 43px;
   margin: 1px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights11 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow3>.spacer {
+.view-order .section1__flexRow3 > .spacer {
   flex: 0 1 508px;
 }
-
 .view-order .section1__highlights25 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -629,21 +540,18 @@
   flex: 0 0 auto;
   min-width: 40px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights25 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__flexRow4 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 27px 0px 0px;
 }
-
 .view-order .section1__highlights26 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -652,18 +560,15 @@
   flex: 0 0 auto;
   min-width: 142px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights26 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow4>.spacer {
+.view-order .section1__flexRow4 > .spacer {
   flex: 0 1 423px;
 }
-
 .view-order .section1__highlights27 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -672,21 +577,18 @@
   flex: 0 0 auto;
   min-width: 26px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights27 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__flexRow5 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 26px 0px 0px;
 }
-
 .view-order .section1__highlights28 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -695,32 +597,27 @@
   flex: 0 0 auto;
   min-width: 61px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights28 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow5>.spacer {
+.view-order .section1__flexRow5 > .spacer {
   flex: 0 1 504px;
 }
-
 .view-order .section1__line21 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 11px 0px 0px;
 }
-
 .view-order .section1__flexRow6 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 16px 0px 0px;
 }
-
 .view-order .section1__highlights5 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -729,18 +626,15 @@
   flex: 0 0 auto;
   min-width: 98px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights5 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow6>.spacer {
+.view-order .section1__flexRow6 > .spacer {
   flex: 0 1 455px;
 }
-
 .view-order .section1__highlights29 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -749,28 +643,24 @@
   flex: 0 0 auto;
   min-width: 38px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights29 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__line22 {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 10px 0px 0px;
 }
-
 .view-order .section1__flexRow7 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 15px 0px 0px;
 }
-
 .view-order .section1__highlights6 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -779,18 +669,15 @@
   flex: 0 0 auto;
   min-width: 89px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights6 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow7>.spacer {
+.view-order .section1__flexRow7 > .spacer {
   flex: 0 1 402px;
 }
-
 .view-order .section1__highlights210 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -799,21 +686,18 @@
   flex: 0 0 auto;
   min-width: 100px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights210 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section1__flexRow8 {
   display: flex;
   align-items: center;
   position: relative;
   margin: 23px 0px 0px;
 }
-
 .view-order .section1__highlights31 {
   font: 700 16px/1.31 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -822,18 +706,15 @@
   flex: 0 0 auto;
   min-width: 64px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights31 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.view-order .section1__flexRow8>.spacer {
+.view-order .section1__flexRow8 > .spacer {
   flex: 0 1 488px;
 }
-
 .view-order .section1__highlights32 {
   font: 700 16px/1.31 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -842,14 +723,12 @@
   flex: 0 0 auto;
   min-width: 39px;
 }
-
 @media (max-width: 1199px) {
   .view-order .section1__highlights32 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .view-order .section2 {
   position: relative;
-}
\ No newline at end of file
+}
diff --git a/src/views/layouts/ViewOrder/ViewOrder.html b/src/views/layouts/ViewOrder/ViewOrder.html
index 31cee7b..8367359 100644
--- a/src/views/layouts/ViewOrder/ViewOrder.html
+++ b/src/views/layouts/ViewOrder/ViewOrder.html
@@ -1,255 +1,292 @@
 <!DOCTYPE html>
 <html>
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
 
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
+      crossorigin="anonymous"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="https://unpkg.com/aos@2.3.1/dist/aos.css"
+    />
+    <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
 
-  <link rel="stylesheet" type="text/css"
-    href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-    integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous" />
-  <!-- Font Awesome is an icon library -->
-  <link rel="stylesheet" type="text/css" href="https://unpkg.com/aos@2.3.1/dist/aos.css" />
-  <!-- 'Animate On Scroll' library -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <!-- Bootstrap linker -->
+    <link rel="stylesheet" type="text/css" href="/css/common.css" />
+    <link rel="stylesheet" type="text/css" href="/css/fonts.css" />
+    <link rel="stylesheet" type="text/css" href="/css/headroom.css" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\layouts\ViewOrder\ViewOrder.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Header\Header0.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="\src\views\partials\Footer\Footer.css"
+    />
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/aos@2.3.1/dist/aos.js"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"
+    ></script>
+  </head>
 
-  <!-- Please DO NOT remove this line, all link and script tags will be merged to here -->
-
-  <link rel="stylesheet" type="text/css" href="\src\views\layouts\ViewOrder\ViewOrder.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Header\Header0.css" />
-  <link rel="stylesheet" type="text/css" href="\src\views\partials\Footer\Footer.css" />
-  <script type="text/javascript" src="/src/views/index.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/aos@2.3.1/dist/aos.js"></script>
-  <script type="text/javascript" src="https://unpkg.com/headroom.js@0.12.0/dist/headroom.min.js"></script>
-</head>
-
-<body class="flex-column">
-  <header id="header" class="headroom">
-    <nav class="max:show">
-      <!-- prettier-ignore -->
-      <div class="header0 header0__group1">
-        <div class="header0__flexRow">
-          <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
-          <div class="spacer"></div>
-          <div class="header0__box">
-            <div class="header0__flexRow1">
-              <div class="cell">
-                <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr">
-                  <div class="header0__txt" onclick="window.location.href='/src/views/layouts/ShopPage/ShopPage.html'">
-                    Shop</div>
-                </px-grid>
-              </div>
-              <div class="cell1">
-                <h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4>
-              </div>
+  <body class="flex-column">
+    <header id="header" class="headroom">
+      <nav class="max:show">
+        <!-- prettier-ignore -->
+        <div class="header0 header0__group1">
+            <div class="header0__flexRow">
+              <h2 class="header0__medium_title" onclick="alert(`It is clickable`)">Urusta.</h2>
               <div class="spacer"></div>
-              <div class="header0__rect5"></div>
-              <div class="spacer1"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png" alt="alt text"
-                  class="header0__image10" onclick="alert(`It is clickable`)" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell3">
-                <img src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png" alt="alt text"
-                  class="header0__icon1" onclick="window.location.href='/src/views/layouts/Cart/Cart.html'" />
-              </div>
-              <div class="spacer2"></div>
-              <div class="cell2">
-                <img src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png" alt="alt text"
-                  class="header0__icon" onclick="alert(`It is clickable`)" />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-  </header>
-  <main class="view-order main">
-    <div class="cell">
-      <!-- ======= section1 ======= -->
-      <section class="section1__section1">
-        <div class="section1__flexCol">
-          <div class="section1__flexRow">
-            <h3 class="section1__subtitle" onclick="alert(`It is clickable`)">
-              Dashboard
-            </h3>
-            <div class="spacer"></div>
-            <div class="section1__group">
-              <hr size="1" class="section1__line1" />
-              <h3 class="section1__subtitle1">Orders</h3>
-            </div>
-            <div class="spacer"></div>
-            <h3 class="section1__subtitle2" onclick="alert(`It is clickable`)">
-              Addresses
-            </h3>
-            <div class="spacer"></div>
-            <h3 class="section1__subtitle3" onclick="alert(`It is clickable`)">
-              Account details
-            </h3>
-            <div class="spacer"></div>
-            <h3 class="section1__subtitle4" onclick="alert(`It is clickable`)">
-              Logout
-            </h3>
-          </div>
-          <hr size="1" class="section1__line" />
-          <div class="section1__flexRow1">
-            <div class="section1__flexCol1">
-              <h2 class="section1__medium_title1">Order Details</h2>
-              <div class="section1__flexRow2">
-                <div class="section1__flexCol2">
-                  <div class="section1__flexCol3">
-                    <h5 class="section1__highlights">ORDER NUMBER</h5>
-                    <h5 class="section1__highlights2">943980998990</h5>
+              <div class="header0__box">
+                <div class="header0__flexRow1">
+                  <div class="cell">
+                    <px-grid track-style="flex-grow: 1;" x="7.02px 70.98fr 24fr" y="0px minmax(0px, max-content) 0fr"
+                      ><div class="header0__txt" onclick="window.location.href = 'ShopPage.html'">Shop</div></px-grid
+                    >
                   </div>
-                  <div class="section1__flexCol4">
-                    <h5 class="section1__highlights">EMAIL</h5>
-                    <h5 class="section1__highlights2">
-                      Plonyalmony@gmail.com
-                    </h5>
+                  <div class="cell1"><h4 class="header0__highlights2" onclick="alert(`It is clickable`)">Our Story</h4></div>
+                  <div class="spacer"></div>
+                  <div class="header0__rect5"></div>
+                  <div class="spacer1"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\d652c1328e3779d6ed57fa1af8dbec68.png"
+                      alt="alt text"
+                      class="header0__image10"
+                      onclick="alert(`It is clickable`)"
+                    />
                   </div>
-                  <div class="section1__flexCol5">
-                    <h5 class="section1__highlights">PAYMENT METHOD</h5>
-                    <h5 class="section1__highlights2">
-                      Mastercard*************7865
-                    </h5>
+                  <div class="spacer2"></div>
+                  <div class="cell3">
+                    <img
+                      src="\src\views\partials\assets\c17d264818e2602d684362f3a37cf356.png"
+                      alt="alt text"
+                      class="header0__icon1"
+                      onclick="alert(`It is clickable`)"
+                    />
                   </div>
-                  <div class="section1__flexCol6">
-                    <h5 class="section1__highlights">ORDER DATE</h5>
-                    <h5 class="section1__highlights21">May 8, 2023</h5>
-                  </div>
-                </div>
-                <div class="spacer"></div>
-                <div class="section1__flexCol7">
-                  <div class="section1__flexCol8">
-                    <h5 class="section1__highlights">DELIVERY OPTIONS</h5>
-                    <h5 class="section1__highlights22">Standard delivery</h5>
-                  </div>
-                  <div class="section1__flexCol5">
-                    <h5 class="section1__highlights1">DELIVERY ADDRESS</h5>
-                    <h5 class="section1__highlights23">
-                      15 David Wolfson St<br />8 Apt, 2 Floor<br />Rishon
-                      Lezion<br />7520323<br />Israel
-                    </h5>
-                  </div>
-                  <div class="section1__flexCol9">
-                    <h5 class="section1__highlights">CONTACT NUMBER</h5>
-                    <h5 class="section1__highlights24">+972 505055655</h5>
+                  <div class="spacer2"></div>
+                  <div class="cell2">
+                    <img
+                      src="\src\views\partials\assets\5f10cef3f154249dc60ba91722a6524f.png"
+                      alt="alt text"
+                      class="header0__icon"
+                      onclick="alert(`It is clickable`)"
+                    />
                   </div>
                 </div>
               </div>
             </div>
-            <div class="spacer"></div>
-            <div class="section1__flexCol10">
-              <h2 class="section1__medium_title">Order Summary</h2>
-              <div class="section1__content_box">
-                <div class="section1__flexCol11">
-                  <div class="section1__flexRow">
-                    <h5 class="section1__highlights3">PRODUCT</h5>
-                    <div class="spacer1"></div>
-                    <h5 class="section1__highlights4">TOTAL</h5>
-                  </div>
-                  <hr size="1" class="section1__line2" />
-                  <div class="section1__flexRow3">
-                    <h5 class="section1__highlights11">CitiZ</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights25">$350</h5>
-                  </div>
-                  <div class="section1__flexRow4">
-                    <h5 class="section1__highlights26">Espresso Cups</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights27">$10</h5>
-                  </div>
-                  <div class="section1__flexRow5">
-                    <h5 class="section1__highlights28">Spoon</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights27">$10</h5>
-                  </div>
-                  <hr size="1" class="section1__line21" />
-                  <div class="section1__flexRow6">
-                    <h5 class="section1__highlights5">SUBTOTAL</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights29">$370</h5>
+          </div>
+      </nav>
+    </header>
+    <main class="view-order main">
+      <div class="cell">
+        <!-- ======= section1 ======= -->
+        <section class="section1__section1">
+          <div class="section1__flexCol">
+            <div class="section1__flexRow">
+              <h3 class="section1__subtitle" onclick="alert(`It is clickable`)">
+                Dashboard
+              </h3>
+              <div class="spacer"></div>
+              <div class="section1__group">
+                <hr size="1" class="section1__line1" />
+                <h3 class="section1__subtitle1">Orders</h3>
+              </div>
+              <div class="spacer"></div>
+              <h3
+                class="section1__subtitle2"
+                onclick="alert(`It is clickable`)"
+              >
+                Addresses
+              </h3>
+              <div class="spacer"></div>
+              <h3
+                class="section1__subtitle3"
+                onclick="alert(`It is clickable`)"
+              >
+                Account details
+              </h3>
+              <div class="spacer"></div>
+              <h3
+                class="section1__subtitle4"
+                onclick="alert(`It is clickable`)"
+              >
+                Logout
+              </h3>
+            </div>
+            <hr size="1" class="section1__line" />
+            <div class="section1__flexRow1">
+              <div class="section1__flexCol1">
+                <h2 class="section1__medium_title1">Order Details</h2>
+                <div class="section1__flexRow2">
+                  <div class="section1__flexCol2">
+                    <div class="section1__flexCol3">
+                      <h5 class="section1__highlights">ORDER NUMBER</h5>
+                      <h5 class="section1__highlights2">943980998990</h5>
+                    </div>
+                    <div class="section1__flexCol4">
+                      <h5 class="section1__highlights">EMAIL</h5>
+                      <h5 class="section1__highlights2">
+                        Plonyalmony@gmail.com
+                      </h5>
+                    </div>
+                    <div class="section1__flexCol5">
+                      <h5 class="section1__highlights">PAYMENT METHOD</h5>
+                      <h5 class="section1__highlights2">
+                        Mastercard*************7865
+                      </h5>
+                    </div>
+                    <div class="section1__flexCol6">
+                      <h5 class="section1__highlights">ORDER DATE</h5>
+                      <h5 class="section1__highlights21">May 8, 2023</h5>
+                    </div>
                   </div>
-                  <hr size="1" class="section1__line22" />
-                  <div class="section1__flexRow7">
-                    <h5 class="section1__highlights6">SHIPPING</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights210">Free shipping</h5>
+                  <div class="spacer"></div>
+                  <div class="section1__flexCol7">
+                    <div class="section1__flexCol8">
+                      <h5 class="section1__highlights">DELIVERY OPTIONS</h5>
+                      <h5 class="section1__highlights22">Standard delivery</h5>
+                    </div>
+                    <div class="section1__flexCol5">
+                      <h5 class="section1__highlights1">DELIVERY ADDRESS</h5>
+                      <h5 class="section1__highlights23">
+                        15 David Wolfson St<br />8 Apt, 2 Floor<br />Rishon
+                        Lezion<br />7520323<br />Israel
+                      </h5>
+                    </div>
+                    <div class="section1__flexCol9">
+                      <h5 class="section1__highlights">CONTACT NUMBER</h5>
+                      <h5 class="section1__highlights24">+972 505055655</h5>
+                    </div>
                   </div>
-                  <hr size="1" class="section1__line22" />
-                  <div class="section1__flexRow8">
-                    <h5 class="section1__highlights31">TOTAL</h5>
-                    <div class="spacer"></div>
-                    <h5 class="section1__highlights32">$370</h5>
+                </div>
+              </div>
+              <div class="spacer"></div>
+              <div class="section1__flexCol10">
+                <h2 class="section1__medium_title">Order Summary</h2>
+                <div class="section1__content_box">
+                  <div class="section1__flexCol11">
+                    <div class="section1__flexRow">
+                      <h5 class="section1__highlights3">PRODUCT</h5>
+                      <div class="spacer1"></div>
+                      <h5 class="section1__highlights4">TOTAL</h5>
+                    </div>
+                    <hr size="1" class="section1__line2" />
+                    <div class="section1__flexRow3">
+                      <h5 class="section1__highlights11">CitiZ</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights25">$350</h5>
+                    </div>
+                    <div class="section1__flexRow4">
+                      <h5 class="section1__highlights26">Espresso Cups</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights27">$10</h5>
+                    </div>
+                    <div class="section1__flexRow5">
+                      <h5 class="section1__highlights28">Spoon</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights27">$10</h5>
+                    </div>
+                    <hr size="1" class="section1__line21" />
+                    <div class="section1__flexRow6">
+                      <h5 class="section1__highlights5">SUBTOTAL</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights29">$370</h5>
+                    </div>
+                    <hr size="1" class="section1__line22" />
+                    <div class="section1__flexRow7">
+                      <h5 class="section1__highlights6">SHIPPING</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights210">Free shipping</h5>
+                    </div>
+                    <hr size="1" class="section1__line22" />
+                    <div class="section1__flexRow8">
+                      <h5 class="section1__highlights31">TOTAL</h5>
+                      <div class="spacer"></div>
+                      <h5 class="section1__highlights32">$370</h5>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
-      </section>
-      <!-- ======= End section1 ======= -->
-    </div>
-    <div class="section2">
-      <!-- prettier-ignore -->
-      <section class="footer footer__section2">
-        <hr size="1" class="footer__line" />
-        <div class="footer__group">
-          <div class="footer__nullContent">
-            <div class="footer__flexCol">
-              <div class="footer__flexRow">
-                <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
-                <div class="spacer"></div>
-                <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
-                <div class="spacer1"></div>
-                <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
-              </div>
-              <h5 class="footer__highlights_box">
-                <span class="footer__highlights"><span class="footer__highlights_span0">© 2023 MadMach.</span><span
-                    class="footer__highlights_span1"> Terms of use </span><span
-                    class="footer__highlights_span2">and</span><span class="footer__highlights_span3"> privacy
-                    policy.</span></span>
-              </h5>
-            </div>
-            <div class="spacer"></div>
-            <div class="footer__flexCol1">
-              <br>
-              <div class="footer__flexCol2">
-                <div class="footer__group1">
-                  <div class="footer__highlights13">
-                    <input class="form-control email-input" type="text"
-                      placeholder="Enter your email, get the newsletter!">
+        </section>
+        <!-- ======= End section1 ======= -->
+      </div>
+      <div class="section2">
+        <!-- prettier-ignore -->
+        <section class="footer footer__section2">
+            <hr size="1" class="footer__line" />
+            <div class="footer__group">
+              <div class="footer__nullContent">
+                <div class="footer__flexCol">
+                  <div class="footer__flexRow">
+                    <h5 class="footer__highlights1" onclick="alert(`It is clickable`)">CONTACT</h5>
+                    <div class="spacer"></div>
+                    <h5 class="footer__highlights11" onclick="alert(`It is clickable`)">TERMS OF SERVICES</h5>
+                    <div class="spacer1"></div>
+                    <h5 class="footer__highlights12" onclick="alert(`It is clickable`)">SHIPPING AND RETURNS</h5>
                   </div>
-                  <div class="footer__image-container">
-                    <img src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
-                      alt="A clickable arrow to submit email" class="footer__image1"
-                      onclick="alert(`It is clickable`)" />
-                    <!-- Send an email with newsletter -->
+                  <h5 class="footer__highlights_box">
+                    <span class="footer__highlights"
+                      ><span class="footer__highlights_span0">© 2023 MadMach.</span
+                      ><span class="footer__highlights_span1"> Terms of use </span
+                      ><span class="footer__highlights_span2">and</span
+                      ><span class="footer__highlights_span3"> privacy policy.</span></span
+                    >
+                  </h5>
+                </div>
+                <div class="spacer"></div>
+                <div class="footer__flexCol1">
+                  <div class="footer__flexCol2">
+                    <div class="footer__group1">
+                      <img
+                        src="\src\views\partials\assets\b7e1c0cf5ea9d66d3515dc9f50dccd61.png"
+                        alt="alt text"
+                        class="footer__image1"
+                        onclick="alert(`It is clickable`)"
+                      />
+                      <h5 class="footer__highlights13">Give an email, get the newsletter.</h5>
+                    </div>
+                    <hr size="1" class="footer__line1" />
                   </div>
                 </div>
-                <br><br>
-                <hr size="1" class="footer__line1" />
               </div>
+              <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text" class="footer__image2" />
             </div>
-          </div>
-          <img src="\src\views\partials\assets\eb08941b8a6fe08d5d6166df2f6af99b.png" alt="alt text"
-            class="footer__image2" />
-        </div>
-      </section>
-    </div>
-  </main>
-  <a href="Cart.html" class="footer pt-6 position-relative bg-dark text-light back-to-top">Back To Top</a>
-
-  <script type="text/javascript">
-    AOS.init();
-    const header = document.querySelector("#header");
-    if (header) {
-      const headroom = new Headroom(header);
-      headroom.init();
-    }
-  </script>
-</body>
+          </section>
+      </div>
+    </main>
+    <script type="text/javascript">
+      AOS.init();
 
-</html>
\ No newline at end of file
+      const header = document.querySelector("#header");
+      if (header) {
+        const headroom = new Headroom(header);
+        headroom.init();
+      }
+    </script>
+  </body>
+</html>
diff --git a/src/views/partials/Footer/Footer.css b/src/views/partials/Footer/Footer.css
index b7794eb..7657f1d 100644
--- a/src/views/partials/Footer/Footer.css
+++ b/src/views/partials/Footer/Footer.css
@@ -3,14 +3,12 @@
   flex-direction: column;
   position: relative;
 }
-
 .footer__line {
   background-color: rgb(216, 216, 216);
   height: 1px;
   position: relative;
   margin: 28px 0px 0px;
 }
-
 .footer__group {
   display: flex;
   flex-direction: column;
@@ -18,62 +16,52 @@
   position: relative;
   margin: 25px auto 67px;
 }
-
 @media (max-width: 1919px) {
   .footer__group {
     width: 86.95%;
   }
 }
-
 @media (max-width: 1399px) {
   .footer__group {
     width: 89.89%;
   }
 }
-
 @media (max-width: 1199px) {
   .footer__group {
     width: 92.22%;
   }
 }
-
 @media (max-width: 991px) {
   .footer__group {
     width: 94.05%;
   }
 }
-
 @media (max-width: 767px) {
   .footer__group {
     width: 95.47%;
   }
 }
-
 @media (max-width: 575px) {
   .footer__group {
     width: 96.56%;
   }
 }
-
 @media (max-width: 479px) {
   .footer__group {
     width: 97.4%;
   }
 }
-
 @media (max-width: 383px) {
   .footer__group {
     width: 98.04%;
   }
 }
-
 .footer__nullContent {
   display: flex;
   align-items: center;
   position: relative;
   flex-grow: 1;
 }
-
 .footer__flexCol {
   display: flex;
   flex-direction: column;
@@ -81,13 +69,11 @@
   flex: 0 1 623px;
   margin: 15px 0px 0px;
 }
-
 .footer__flexRow {
   display: flex;
   align-items: center;
   position: relative;
 }
-
 .footer__highlights1 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -98,18 +84,15 @@
   min-width: 94px;
   margin: 1px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .footer__highlights1 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.footer__flexRow>.spacer {
+.footer__flexRow > .spacer {
   flex: 0 1 52px;
 }
-
 .footer__highlights11 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -120,18 +103,15 @@
   min-width: 195px;
   margin: 0px 0px 1px;
 }
-
 @media (max-width: 1199px) {
   .footer__highlights11 {
     font-size: 12px;
     text-align: left;
   }
 }
-
-.footer__flexRow>.spacer1 {
+.footer__flexRow > .spacer1 {
   flex: 0 1 53px;
 }
-
 .footer__highlights12 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -142,71 +122,60 @@
   min-width: 229px;
   margin: 0px 0px 1px;
 }
-
 @media (max-width: 1199px) {
   .footer__highlights12 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .footer__highlights_box {
   position: relative;
   margin: 47px 0px 0px;
 }
-
 @media (max-width: 1199px) {
   .footer__highlights_box {
     align-items: flex-start;
     justify-content: flex-start;
   }
 }
-
 .footer__highlights {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   letter-spacing: 0px;
 }
-
 @media (max-width: 1199px) {
   .footer__highlights {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .footer__highlights_span0 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .footer__highlights_span1 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .footer__highlights_span2 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
   font-style: normal;
   letter-spacing: 0px;
 }
-
 .footer__highlights_span3 {
   font: 1em/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(111, 111, 111);
   font-style: normal;
   letter-spacing: 0px;
 }
-
-.footer__nullContent>.spacer {
+.footer__nullContent > .spacer {
   flex: 1 1 469px;
 }
-
 .footer__flexCol1 {
   display: flex;
   flex-direction: column;
@@ -214,20 +183,17 @@
   flex: 0 1 508px;
   margin: 0px 0px 8px;
 }
-
 .footer__flexCol2 {
   display: flex;
   flex-direction: column;
   position: relative;
 }
-
 .footer__group1 {
   display: flex;
   flex-direction: column;
   position: relative;
   bottom: 20px;
 }
-
 .footer__image1 {
   width: 32px;
   height: auto;
@@ -240,7 +206,6 @@
   top: 10px;
   right: 0px;
 }
-
 .footer__highlights13 {
   font: 400 16px/1.68 "DM Sans", Helvetica, Arial, serif;
   color: rgb(112, 112, 112);
@@ -248,14 +213,12 @@
   position: relative;
   flex-grow: 1;
 }
-
 @media (max-width: 1199px) {
   .footer__highlights13 {
     font-size: 12px;
     text-align: left;
   }
 }
-
 .footer__line1 {
   background-color: rgb(0, 0, 0);
   height: 1px;
@@ -263,7 +226,6 @@
   margin: 5px 0px 0px;
   bottom: 50px;
 }
-
 .footer__image2 {
   width: 224px;
   height: auto;
@@ -276,25 +238,4 @@
   right: 0px;
 }
 
-.email-input {
-  width: 280px;
-  padding-left: 3px;
-}
-
-.back-to-top {
-  display: block;
-  text-align: center;
-  background-color: #4a4a4a;
-  color: #fff;
-  padding: 10px 20px;
-  text-decoration: none;
-  border-radius: 5px;
-  font-size: 19px;
-}
-
-.back-to-top:hover {
-  background-color: rgb(55, 54, 54);
-  text-decoration: none;
-}
-
-/*# sourceMappingURL=Footer.css.map */
\ No newline at end of file
+/*# sourceMappingURL=Footer.css.map */
diff --git a/src/views/partials/Header/Header0.css b/src/views/partials/Header/Header0.css
index 68001bc..7d526df 100644
--- a/src/views/partials/Header/Header0.css
+++ b/src/views/partials/Header/Header0.css
@@ -4,7 +4,6 @@
   background-color: rgb(255, 255, 255);
   position: relative;
 }
-
 .header0__flexRow {
   display: flex;
   align-items: center;
@@ -13,7 +12,6 @@
   flex-grow: 1;
   margin: 29px auto 25px;
 }
-
 .header0__medium_title {
   font: 700 26px/1.5 "Poppins", Helvetica, Arial, serif;
   color: rgb(0, 0, 0);
@@ -25,11 +23,9 @@
   min-height: 37px;
   max-height: 37px;
 }
-
-.header0__flexRow>.spacer {
+.header0__flexRow > .spacer {
   flex: 1 1 227px;
 }
-
 .header0__box {
   display: flex;
   flex-direction: column;
@@ -38,7 +34,6 @@
   flex: 0 1 1271px;
   margin: 3px 0px 6px;
 }
-
 .header0__flexRow1 {
   display: flex;
   align-items: center;
@@ -47,14 +42,12 @@
   flex-grow: 1;
   margin: 8px 0% 7px 67.9%;
 }
-
-.header0__flexRow1>.cell {
+.header0__flexRow1 > .cell {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 100px;
 }
-
 .header0__txt {
   display: flex;
   justify-content: center;
@@ -66,15 +59,13 @@
   height: 100%;
   cursor: pointer;
 }
-
-.header0__flexRow1>.cell1 {
+.header0__flexRow1 > .cell1 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 0 96px;
   min-width: 96px;
 }
-
 .header0__highlights2 {
   display: flex;
   justify-content: center;
@@ -87,11 +78,9 @@
   flex-grow: 1;
   margin: 0px 0px 0px 9px;
 }
-
-.header0__flexRow1>.spacer {
+.header0__flexRow1 > .spacer {
   flex: 0 1 39px;
 }
-
 .header0__rect5 {
   background-color: rgb(0, 0, 0);
   position: relative;
@@ -100,18 +89,15 @@
   min-height: 17px;
   margin: 4px 0px 6px;
 }
-
-.header0__flexRow1>.spacer1 {
+.header0__flexRow1 > .spacer1 {
   flex: 0 1 48px;
 }
-
-.header0__flexRow1>.cell2 {
+.header0__flexRow1 > .cell2 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 20px;
 }
-
 .header0__image10 {
   width: 20px;
   height: auto;
@@ -124,18 +110,15 @@
   min-width: 20px;
   margin: 4px 0px 4px 12px;
 }
-
-.header0__flexRow1>.spacer2 {
+.header0__flexRow1 > .spacer2 {
   flex: 0 1 40px;
 }
-
-.header0__flexRow1>.cell3 {
+.header0__flexRow1 > .cell3 {
   display: flex;
   flex-direction: column;
   position: relative;
   flex: 0 1 21px;
 }
-
 .header0__icon1 {
   width: 21px;
   height: auto;
@@ -148,7 +131,6 @@
   min-width: 21px;
   margin: 4px 0px 2px;
 }
-
 .header0__icon {
   width: 20px;
   height: auto;
@@ -162,4 +144,4 @@
   margin: 3px 0px 4px;
 }
 
-/*# sourceMappingURL=Header0.css.map */
\ No newline at end of file
+/*# sourceMappingURL=Header0.css.map */