diff --git a/.env b/.env
index e6e72e0..ae31d3e 100644
--- a/.env
+++ b/.env
@@ -10,5 +10,8 @@ PP_RETURN=http://iolovolio.local/thankyou
 PP_AUTH_URL=https://api-m.sandbox.paypal.com/v1/oauth2/token
 PP_ORDER_URL=https://api-m.sandbox.paypal.com/v2/checkout/orders
 
+RECAPTCHA_SITE_KEY=6LfD8FgcAAAAANpdeDvkFRHk8VXTgC7huXa3LKqe
+RECAPTCHA_SECRET_KEY=6LfD8FgcAAAAAOZgo5UgR_BRLd83NS3qdFdBA6XH
+
 #dslaky-buyer@gmail.com dslakyPwd
 #dslaky-facilitator@gmail.com dslakyPwd
diff --git a/.env_prod b/.env_prod
index 56e2129..f2f13b4 100644
--- a/.env_prod
+++ b/.env_prod
@@ -9,3 +9,6 @@ PP_CANCEL=http://www.iolovolio.com/checkout
 PP_RETURN=http://www.iolovolio.com/thankyou
 PP_AUTH_URL=https://api-m.sandbox.paypal.com/v1/oauth2/token
 PP_ORDER_URL=https://api-m.sandbox.paypal.com/v2/checkout/orders
+
+RECAPTCHA_SITE_KEY=6LfD8FgcAAAAANpdeDvkFRHk8VXTgC7huXa3LKqe
+RECAPTCHA_SECRET_KEY=6LfD8FgcAAAAAOZgo5UgR_BRLd83NS3qdFdBA6XH
diff --git a/OLD/components/article/article.html b/OLD/components/article/article.html
deleted file mode 100644
index 6b308ea..0000000
--- a/OLD/components/article/article.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<div class="component-article">
-<div class="container">
-    <div class="row">
-      <div class="col-12 col-md-10 pb-4">
-        <div class="row">
-
-          <div class="col-12 pb-4">
-            <input type="text" class="input-gray" placeholder="Cerca...">
-          </div>
-
-          <div class="col-12">
-            <img class="image" src="/images/articleHeader.png">
-          </div>
-          <div class="col-12">
-            <h2 class="title">
-              La tecnica dell'assaggio
-            </h2>
-            <span class="subtitle">
-              Come degustare un olio extravergine
-            </span>
-            <span class="text">
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-            </span>
-          </div>
-
-        </div>
-      </div>
-      <div class="col-12 col-md-2 banner">
-        <br><br>banner<br><br>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/OLD/components/article/article.js b/OLD/components/article/article.js
deleted file mode 100644
index 5c586fb..0000000
--- a/OLD/components/article/article.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - article')
-
-})
\ No newline at end of file
diff --git a/OLD/components/article/article.scss b/OLD/components/article/article.scss
deleted file mode 100644
index e70e6e5..0000000
--- a/OLD/components/article/article.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-article {
-  padding: 40px 0;
-
-  .banner {
-    background: $light-gray;
-    text-align: center;
-  }
-
-  .image {
-    width: 100%;
-  }
-
-  .title {
-    display: block;
-    font-size: $font-30;
-    font-weight: normal;
-    padding: 15px 0;
-    margin: 0;
-    color: $olive;
-  }
-
-  .subtitle {
-    display: block;
-    font-size: $font-18;
-    font-weight: bold;
-    padding-bottom: 7px;
-    margin-bottom: 15px;
-    color: $dark-gray;
-  }
-
-  .text {
-    display: block;
-    font-size: $font-16;
-    padding-bottom: 5px;
-    color: $dark-gray;
-  }
-
-}
diff --git a/OLD/components/articleBox/articleBox.html b/OLD/components/articleBox/articleBox.html
deleted file mode 100644
index 32b76b8..0000000
--- a/OLD/components/articleBox/articleBox.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="component-articleBox">
-  <a href="/article">
-    <img class="image" src="/images/article1.png">
-    <span class="title">Titolo articolo </span>
-    <span class="marker olive"></span>
-  </a>
-</div>
diff --git a/OLD/components/articleBox/articleBox.js b/OLD/components/articleBox/articleBox.js
deleted file mode 100644
index fe1befd..0000000
--- a/OLD/components/articleBox/articleBox.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - articleBox')
-
-})
\ No newline at end of file
diff --git a/OLD/components/articleBox/articleBox.scss b/OLD/components/articleBox/articleBox.scss
deleted file mode 100644
index e9db49e..0000000
--- a/OLD/components/articleBox/articleBox.scss
+++ /dev/null
@@ -1,60 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-articleBox {
-
-  position: relative;
-  padding-bottom: 20px;
-  height: 100%;
-
-  .image {
-    width: 100%;
-    padding-bottom: 10px;
-  }
-
-  .title {
-    display: block;
-    width: 100%;
-    padding-right: 5px;
-    font-size: $font-16;
-    font-weight: 600;
-    line-height: $font-16;
-    color: $black;
-  }
-
-  .marker {
-    position: absolute;
-    top: 10px;
-    left: 10px;
-
-    &:before {
-      position: absolute;
-      content: '\e903';
-      font-family: $icon;
-      font-size: 30px;
-      color: $white;
-    }
-    &:after {
-      position: absolute;
-      top: 4px;
-      left: 3px;
-      content: '\e903';
-      font-family: $icon;
-      font-size: 24px;
-      color: $gray;
-    }
-    &.olive {
-      &:after {color: $olive;}
-    }
-    &.gray {
-      &:after {color: $dark-gray;}
-    }
-    &.white {
-      &:after {color: $white;}
-    }
-    &.orange {
-      &:after {color: $orange;}
-    }
-  }
-
-}
diff --git a/OLD/components/articleBox/articleBox2.html b/OLD/components/articleBox/articleBox2.html
deleted file mode 100644
index d548f30..0000000
--- a/OLD/components/articleBox/articleBox2.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="component-articleBox">
-  <a href="/article">
-    <img class="image" src="/images/article2.png">
-    <span class="title">Titolo articolo test 2 </span>
-    <span class="marker gray"></span>
-  </a>
-</div>
diff --git a/OLD/components/articleBox/articleBox3.html b/OLD/components/articleBox/articleBox3.html
deleted file mode 100644
index 07ca4b2..0000000
--- a/OLD/components/articleBox/articleBox3.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="component-articleBox">
-  <a href="/article">
-    <img class="image" src="/images/article3.png">
-    <span class="title">Titolo articolo </span>
-    <span class="marker white"></span>
-  </a>
-</div>
diff --git a/OLD/components/articleBox/articleBox4.html b/OLD/components/articleBox/articleBox4.html
deleted file mode 100644
index 0844849..0000000
--- a/OLD/components/articleBox/articleBox4.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="component-articleBox">
-  <a href="/article">
-    <img class="image" src="/images/article4.png">
-    <span class="title">Titolo articolo </span>
-    <span class="marker orange"></span>
-  </a>
-</div>
diff --git a/OLD/components/articles/articles.html b/OLD/components/articles/articles.html
deleted file mode 100644
index 41f229c..0000000
--- a/OLD/components/articles/articles.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="component-articles">
-  <div class="container">
-    <div class="row">
-      <div class="col-12 col-md-10">
-        <div class="row">
-
-          <div class="col-12 pb-1">
-            <input type="text" class="input-gray" placeholder="Cerca...">
-          </div>
-
-          <div class="col-12 pb-4">
-            <select class="select">
-              <option value="">Filtra</option>
-              <option value="1">Opzione 1</option>
-              <option value="2">Opzione 2</option>
-              <option value="3">Opzione 3</option>
-              <option value="4">Opzione 4</option>
-            </select>
-          </div>
-
-
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox2.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox3.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox4.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../articleBox/articleBox.html')}
-          </div>
-        </div>
-      </div>
-      <div class="col-12 col-md-2 banner">
-        <br><br>banner
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/OLD/components/articles/articles.js b/OLD/components/articles/articles.js
deleted file mode 100644
index 24ab23b..0000000
--- a/OLD/components/articles/articles.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - articles')
-
-})
\ No newline at end of file
diff --git a/OLD/components/articles/articles.scss b/OLD/components/articles/articles.scss
deleted file mode 100644
index 380b646..0000000
--- a/OLD/components/articles/articles.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-articles {
-  padding: 40px 0;
-
-  .banner {
-    background: $light-gray;
-    text-align: center;
-  }
-}
diff --git a/OLD/components/footer/footer.html b/OLD/components/footer/footer.html
deleted file mode 100644
index cc3f26e..0000000
--- a/OLD/components/footer/footer.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="component-footer">
-  <div class="container d-flex my-auto">
-    <ul class="menu">
-      <li class="item mr-md-4">
-        <a href="/iolovolio" class="label"><b>io</b>lov<b>olio</b></a>
-      </li>
-      <li class="item">
-        <a href="/terms" class="label">Termini servizio</a>
-      </li>
-      <li class="item">
-        <a href="/privacy" class="label">Privacy</a>
-      </li>
-      <li class="item">
-        <a href="/contacts" class="label">Contatti</a>
-      </li>
-    </ul>
-  </div>
-</div>
diff --git a/OLD/components/footer/footer.js b/OLD/components/footer/footer.js
deleted file mode 100644
index 23dd2cf..0000000
--- a/OLD/components/footer/footer.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - footer')
-
-})
\ No newline at end of file
diff --git a/OLD/components/footer/footer.scss b/OLD/components/footer/footer.scss
deleted file mode 100644
index 72a5138..0000000
--- a/OLD/components/footer/footer.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-footer {
-  //position: absolute;
-  display: flex;
-  padding: 10px 0;
-  text-align: center;
-  width: 100%;
-  bottom: 0;
-  background: $gray;
-  color: $white;
-
-  .menu {
-    display: block;
-    height: 100%;
-    width: 100%;
-    list-style: none;
-    margin: 0;
-    padding: 0;
-
-    .item {
-      display: block;
-      color: $white;
-      margin: auto 20px auto 0;
-      font-size: $font-12;
-      letter-spacing: 2px;
-      padding: 5px;
-
-      .label {
-        color: $white;
-      }
-    }
-  }
-}
-
-@media (min-width: map-get($grid-breakpoints, 'md')) {
-  .component-footer {
-    height: $footer-height;
-    .menu {
-      display: flex;
-      .item {
-        display: flex;
-        padding: 0;
-      }
-    }
-  }
-}
diff --git a/OLD/components/header/header.html b/OLD/components/header/header.html
deleted file mode 100644
index f9d5457..0000000
--- a/OLD/components/header/header.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<header class="component-header">
-
-  <div class="container header-wrapper">
-    <button class="hamburger hamburger--spin my-auto">
-      <span class="hamburger-box">
-        <span class="hamburger-inner"></span>
-      </span>
-    </button>
-
-    <div class="actions">
-      <button class="icon icon-user"></button>
-      <button class="icon icon-cart"><span class="qty">3</span></button>
-    </div>
-
-    <ul class="menu">
-      <li class="item <?php if(!$_GET['q'] || $_GET['q'] == 'iolovolio') { echo "active";}?>">
-        <a href="/iolovolio" class="label"><b>io</b>lov<b>olio ...</b></a>
-      </li>
-      <li class="item <?php if($_GET['q'] == 'buy' || $_GET['q'] == 'product') { echo "active";}?>">
-        <a href="/buy" class="label">acquistare</a>
-      </li>
-      <li class="item <?php if($_GET['q'] == 'article' || $_GET['q'] == 'learn') { echo "active";}?>">
-        <a href="/learn" class="label">imparare</a>
-      </li>
-      <li class="item disabled">
-        <span class="label">produrre (coming soon)</span>
-      </li>
-    </ul>
-
-    <ul class="sidebar-menu">
-      <li class="item <?php if(!$_GET['q'] || $_GET['q'] == 'iolovolio') { echo "active";}?>">
-        <a href="/iolovolio" class="label"><b>io</b>lov<b>olio ...</b></a>
-      </li>
-      <li class="item <?php if($_GET['q'] == 'buy' || $_GET['q'] == 'product') { echo "active";}?>">
-        <a href="/buy" class="label">acquistare</a>
-      </li>
-      <li class="item <?php if($_GET['q'] == 'article' || $_GET['q'] == 'learn') { echo "active";}?>">
-        <a href="/learn" class="label">imparare</a>
-      </li>
-      <li class="item disabled">
-        <span class="label">produrre (coming soon)</span>
-      </li>
-    </ul>
-  </div>
-
-</header>
diff --git a/OLD/components/header/header.js b/OLD/components/header/header.js
deleted file mode 100644
index eec0076..0000000
--- a/OLD/components/header/header.js
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - header')
-
-  const component = $('.component-header')
-
-  const hamburger = component.find('.hamburger')
-  const menu = component.find('.sidebar-menu')
-
-  hamburger.off('.click').on('click.click', (e) => {
-    const ham = $(e.currentTarget)
-
-    ham.toggleClass('is-active')
-    console.log(ham, menu)
-
-    if(ham.hasClass('is-active')){
-      menu.addClass('active')
-    } else {
-      menu.removeClass('active')
-    }
-  })
-
-})
diff --git a/OLD/components/header/header.scss b/OLD/components/header/header.scss
deleted file mode 100644
index 763b852..0000000
--- a/OLD/components/header/header.scss
+++ /dev/null
@@ -1,167 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-header {
-  position: fixed;
-  display: flex;
-  top: 0;
-  left: 0;
-  height: $header-height-mobile;
-  width: 100%;
-  background: $olive;
-  color: $white;
-  z-index: 200;
-
-  .header-wrapper {
-    display: flex;
-    position: relative;
-
-    .hamburger {
-      display: flex;
-      margin-right: 20px;
-    }
-
-    .actions {
-      position: absolute;
-      right: 10px;
-      top: 50%;
-      transform: translateY(-50%);
-
-      .icon {
-        position: relative;
-        margin: 0 5px;
-        padding: 0;
-        background: none;
-        border: none;
-        color: $white;
-        font-size: $font-24;
-
-        .qty {
-          position: absolute;
-          top: -5px;
-          right: -5px;
-          height: 15px;
-          width: 15px;
-          border-radius: 50%;
-          background: $orange;
-          color: $white;
-          font-size: $font-12;
-          line-height: $font-16;
-          font-family: $font-sans;
-        }
-      }
-    }
-
-    .menu {
-      display: none;
-      list-style: none;
-      margin: 0;
-      padding: 0;
-
-      .item {
-        display: flex;
-        color: $white;
-        margin: auto 20px;
-        font-size: $font-20;
-        letter-spacing: 2px;
-
-        .label {
-          color: $white;
-        }
-
-        &.active {
-          border-bottom: 2px solid $white;
-        }
-
-        &.disabled {
-          .label {
-            color: $white-alpha;
-          }
-        }
-      }
-    }
-
-    .sidebar-menu {
-      position: fixed;
-      top: $header-height-mobile;
-      left: 0;
-      height: calc(100vh - #{$header-height-mobile});
-      background: $olive;
-      display: block;
-      list-style: none;
-      margin: 0;
-      padding: 0;
-      transform: translateX(-100%);
-      transition: transform .3s;
-
-      .item {
-        display: block;
-        color: $white;
-        margin: 20px;
-        font-size: $font-20;
-        letter-spacing: 2px;
-        padding: 20px;
-        border-bottom: 1px dotted $gray;
-
-        .label {
-          color: $white;
-        }
-
-        &.active {
-          //border-bottom: 2px solid $white;
-        }
-
-        &.disabled {
-          .label {
-            color: $white-alpha;
-          }
-        }
-      }
-
-      &.active {
-        transform: translateX(0%);
-      }
-    }
-  }
-}
-
-
-
-
-@media (min-width: map-get($grid-breakpoints, 'md')) {
-  .component-header {
-    height: $header-height;
-
-    .header-wrapper {
-      .actions {
-        position: absolute;
-        right: 0;
-
-        .icon {
-          margin: 0 5px;
-          font-size: $font-30;
-
-          .qty {
-            position: absolute;
-            top: -15px;
-            right: -15px;
-            height: 25px;
-            width: 25px;
-            font-size: $font-20;
-            line-height: $font-24;
-          }
-        }
-      }
-
-      .menu {
-        display: flex;
-      }
-
-      .sidebar-menu {
-        top: $header-height;
-        height: calc(100vh - #{$header-height});
-      }
-    }
-  }
-}
-
diff --git a/OLD/components/home/home.html b/OLD/components/home/home.html
deleted file mode 100644
index 1941b92..0000000
--- a/OLD/components/home/home.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<div class="component-home">
-  <div class="container my-auto">
-    <div class="row">
-      <div class="col-12 col-sm-6 col-md-4 order-1 order-md-0">
-        <img class="drop" src="/images/drop1.png">
-        <span class="title"><b>io</b>lov<b>olio</b> acquistare</span>
-        <span class="subtitle"></span>
-        <a href="/buy" class="button button-big w-100 text-uppercase">Vai allo shop</a>
-      </div>
-      <div class="col-12 col-md-4 order-0 order-md-1">
-        <img class="logo" src="/images/logo.png">
-      </div>
-      <div class="col-12 col-sm-6 col-md-4 order-2 order-md-2">
-        <img class="drop" src="/images/drop2.png">
-        <span class="title"><b>io</b>lov<b>olio</b> produrre</span>
-        <span class="subtitle">Avvisami quando l'opzione sarà attiva</span>
-        <input type="text" class="input input-big" placeholder="latuamail@mail.com">
-        <span class="privacy">*Autorizzo il trattamento dei miei dati personali ai sensi del Dlgs 196 del 30 giugno 2003 e dell'art. 13 GDPR (Regolamento UE 2016/679)</span>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/OLD/components/home/home.js b/OLD/components/home/home.js
deleted file mode 100644
index 2bfacb9..0000000
--- a/OLD/components/home/home.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-$(document).ready( () => {
-  console.log('Load component - home')
-
-})*/
diff --git a/OLD/components/home/home.scss b/OLD/components/home/home.scss
deleted file mode 100644
index 1f08ad1..0000000
--- a/OLD/components/home/home.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-home {
-  display: flex;
-  background: $olive;
-  min-height: calc(100vh - #{$footer-height});
-  padding: $header-height-mobile 40px 0 40px;
-
-  .drop {
-    width: 100%;
-    padding: 40px 70px 10px 70px;
-  }
-
-  .title {
-    display: block;
-    color: $white;
-    font-size: $font-28;
-    text-align: center;
-  }
-
-  .subtitle {
-    display: block;
-    min-height: 30px;
-    color: $white;
-    font-size: $font-18;
-    text-align: center;
-  }
-
-  .privacy {
-    display: block;
-    color: $white;
-    font-size: $font-12;
-    text-align: left;
-    padding-bottom: 50px;
-  }
-
-  .logo {
-    width: 100%;
-  }
-}
-
-@media (min-width: map-get($grid-breakpoints, 'md')) {
-  .component-home {
-    padding: $header-height 40px 0 40px;
-
-    .logo {
-      width: calc(100% + 100px);
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-    }
-  }
-}
diff --git a/OLD/components/pdp/pdp.html b/OLD/components/pdp/pdp.html
deleted file mode 100644
index dbcecaa..0000000
--- a/OLD/components/pdp/pdp.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<div class="component-pdp">
-  <div class="container">
-    <div class="row">
-      <div class="col-12 col-md-10 pb-4">
-        <div class="row">
-
-          <div class="col-12 pb-4">
-            <input type="text" class="input-gray" placeholder="Cerca...">
-          </div>
-
-          <div class="col-12 col-sm-6 col-md-5">
-            <img class="image" src="/images/prod2.png">
-          </div>
-          <div class="col-12 col-sm-6 col-md-4 px-3">
-            <h2 class="title">
-              Nome prodotto
-            </h2>
-            <span class="subtitle">
-              Dettagli
-            </span>
-            <span class="text">
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-            </span>
-          </div>
-          <div class="col-12 col-sm-12 col-md-3">
-            <span class="price">17,90 €</span>
-            <button class="button button-black w-100">Aggiungi al carrello</button>
-            <div class="related">
-              <br><br>Prodotti correlati<br><br>
-            </div>
-          </div>
-
-
-        </div>
-      </div>
-      <div class="col-12 col-md-2 banner">
-        <br><br>banner<br><br>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/OLD/components/pdp/pdp.js b/OLD/components/pdp/pdp.js
deleted file mode 100644
index 5dc5ec4..0000000
--- a/OLD/components/pdp/pdp.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - pdp')
-
-})
\ No newline at end of file
diff --git a/OLD/components/pdp/pdp.scss b/OLD/components/pdp/pdp.scss
deleted file mode 100644
index 603f6e0..0000000
--- a/OLD/components/pdp/pdp.scss
+++ /dev/null
@@ -1,54 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-pdp {
-  padding: 40px 0;
-
-  .banner {
-    background: $light-gray;
-    text-align: center;
-  }
-
-  .image {
-    width: 100%;
-  }
-
-  .title {
-    display: block;
-    font-size: $font-30;
-    font-weight: normal;
-    padding: 0 0 30px 0;
-    margin: 0;
-  }
-
-  .subtitle {
-    display: block;
-    font-size: $font-12;
-    text-transform: uppercase;
-    padding-bottom: 7px;
-    margin-bottom: 30px;
-    border-bottom: 1px solid $gray;
-  }
-
-  .text {
-    display: block;
-    font-size: $font-12;
-    padding-bottom: 5px;
-  }
-
-  .price {
-    display: block;
-    font-size: $font-26;
-    font-weight: normal;
-    text-align: right;
-    padding: 0 0 20px 0;
-    margin: 0;
-  }
-
-  .related {
-    background: $light-gray;
-    text-align: center;
-    margin-top: 40px;
-    height: calc(100% - 130px);
-  }
-}
diff --git a/OLD/components/plp/plp.html b/OLD/components/plp/plp.html
deleted file mode 100644
index 6cda930..0000000
--- a/OLD/components/plp/plp.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<div class="component-plp">
-  <div class="container">
-    <div class="row">
-      <div class="col-12 col-md-10">
-        <div class="row">
-
-          <div class="col-12 pb-1">
-            <input type="text" class="input-gray" placeholder="Cerca...">
-          </div>
-
-          <div class="col-12 pb-4">
-            <select class="select">
-              <option value="">Filtra</option>
-              <option value="1">Opzione 1</option>
-              <option value="2">Opzione 2</option>
-              <option value="3">Opzione 3</option>
-              <option value="4">Opzione 4</option>
-            </select>
-          </div>
-
-
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox2.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox3.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox4.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox.html')}
-          </div>
-          <div class="col-12 col-sm-6 col-md-3">
-            ${require('../productBox/productBox.html')}
-          </div>
-        </div>
-      </div>
-      <div class="col-12 col-md-2 banner">
-        <br><br>banner<br><br>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/OLD/components/plp/plp.js b/OLD/components/plp/plp.js
deleted file mode 100644
index fa0f8b0..0000000
--- a/OLD/components/plp/plp.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - plp')
-
-})
\ No newline at end of file
diff --git a/OLD/components/plp/plp.scss b/OLD/components/plp/plp.scss
deleted file mode 100644
index 9a8368a..0000000
--- a/OLD/components/plp/plp.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-plp {
-  padding: 40px 0;
-
-  .banner {
-    background: $light-gray;
-    text-align: center;
-  }
-
-}
diff --git a/OLD/components/productBox/productBox.html b/OLD/components/productBox/productBox.html
deleted file mode 100644
index 443d55e..0000000
--- a/OLD/components/productBox/productBox.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="component-productBox">
-  <a href="/product">
-    <img class="image" src="/images/prod1.png">
-    <div class="d-flex">
-      <span class="title">Nome prodotto </span>
-      <span class="price">17,90 €</span>
-    </div>
-  </a>
-  <button class="button button-black add-to-cart">Aggiungi al carrello</button>
-</div>
diff --git a/OLD/components/productBox/productBox.js b/OLD/components/productBox/productBox.js
deleted file mode 100644
index 7ccd94d..0000000
--- a/OLD/components/productBox/productBox.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-$(document).ready( () => {
-  console.log('Load component - productBox')
-
-})
\ No newline at end of file
diff --git a/OLD/components/productBox/productBox.scss b/OLD/components/productBox/productBox.scss
deleted file mode 100644
index 282a7ae..0000000
--- a/OLD/components/productBox/productBox.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-@import "../../src/scss/variables.scss";
-@import "../../src/scss/mixins.scss";
-
-.component-productBox {
-  position: relative;
-  padding-bottom: 80px;
-  height: 100%;
-
-  .image {
-    width: 100%;
-    padding-bottom: 10px;
-  }
-
-  .title {
-    display: inline-block;
-    width: calc(100% - 70px);
-    padding-right: 5px;
-    font-size: $font-16;
-    font-weight: 600;
-    line-height: $font-16;
-    color: $black;
-  }
-
-  .price {
-    display: inline-block;
-    width: 70px;
-    font-size: $font-16;
-    font-weight: light;
-    text-align: right;
-    white-space: no-wrap;
-    color: $black;
-  }
-
-  .add-to-cart{
-    position: absolute;
-    bottom: 20px;
-    width: 100%;
-  }
-}
-
diff --git a/OLD/components/productBox/productBox2.html b/OLD/components/productBox/productBox2.html
deleted file mode 100644
index 58a0d79..0000000
--- a/OLD/components/productBox/productBox2.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="component-productBox">
-  <a href="/product">
-    <img class="image" src="/images/prod2.png">
-    <div class="d-flex">
-      <span class="title">Nome prodotto Nome prodotto Nome prodotto </span>
-      <span class="price">170,90 €</span>
-    </div>
-  </a>
-  <button class="button button-black add-to-cart">Aggiungi al carrello</button>
-</div>
diff --git a/OLD/components/productBox/productBox3.html b/OLD/components/productBox/productBox3.html
deleted file mode 100644
index 32210e0..0000000
--- a/OLD/components/productBox/productBox3.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="component-productBox">
-  <a href="/product">
-    <img class="image" src="/images/prod3.png">
-    <div class="d-flex">
-      <span class="title">Nome prodotto</span>
-      <span class="price">7,90 €</span>
-    </div>
-  </a>
-  <button class="button button-black add-to-cart">Aggiungi al carrello</button>
-</div>
diff --git a/OLD/components/productBox/productBox4.html b/OLD/components/productBox/productBox4.html
deleted file mode 100644
index 0f08f59..0000000
--- a/OLD/components/productBox/productBox4.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="component-productBox">
-  <a href="/product">
-    <img class="image" src="/images/prod4.png">
-    <div class="d-flex">
-      <span class="title">Nome prodotto</span>
-      <span class="price">8,90 €</span>
-    </div>
-  </a>
-  <button class="button button-black add-to-cart">Aggiungi al carrello</button>
-</div>
diff --git a/OLD/pages/.htaccess b/OLD/pages/.htaccess
deleted file mode 100644
index 74b5589..0000000
--- a/OLD/pages/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^([^\.]+)$ index.php?q=$1 [NC,L]
-#
-# Rewritebase /
-# RewriteCond %{REQUEST_FILENAME} !-f
-# RewriteCond %{REQUEST_FILENAME} !-d
-# RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
diff --git a/OLD/pages/article.ejs b/OLD/pages/article.ejs
deleted file mode 100644
index c5f8b1a..0000000
--- a/OLD/pages/article.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-
- ${require('../components/article/article.html')}
-
-
-
diff --git a/OLD/pages/buy.ejs b/OLD/pages/buy.ejs
deleted file mode 100644
index ca7ccee..0000000
--- a/OLD/pages/buy.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-
- ${require('../components/plp/plp.html')}
-
-
-
diff --git a/OLD/pages/home.ejs b/OLD/pages/home.ejs
deleted file mode 100644
index 331e28a..0000000
--- a/OLD/pages/home.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-
- ${require('../components/home/home.html')}
-
-
-
diff --git a/OLD/pages/index.ejs b/OLD/pages/index.ejs
deleted file mode 100644
index 88383a8..0000000
--- a/OLD/pages/index.ejs
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html lang="it">
-  <head>
-    <meta charset="UTF-8">
-    <title>IoLovOlio</title>
-    <meta name="viewport" content="width=device-width, user-scalable=no,initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
-    <meta name="description" content=".">
-    <link rel="stylesheet" href="/assets/css/styles.css">
-  </head>
-  <body>
-
-    ${require('../components/header/header.html')}
-
-
-    <?php
-      if(!$_GET['q'] || $_GET['q'] == 'home' || $_GET['q'] == 'iolovolio') {
-        @include 'home.php';
-      } else {
-    ?>
-      <main class="main-content">
-    <?php
-        @include $_GET['q'].'.php';
-    ?>
-      </main>
-    <?php
-      }
-    ?>
-
-    ${require('../components/footer/footer.html')}
-
-  </body>
-</html>
diff --git a/OLD/pages/learn.ejs b/OLD/pages/learn.ejs
deleted file mode 100644
index 1be7946..0000000
--- a/OLD/pages/learn.ejs
+++ /dev/null
@@ -1,5 +0,0 @@
-
- ${require('../components/articles/articles.html')}
-
-
-
diff --git a/OLD/pages/product.ejs b/OLD/pages/product.ejs
deleted file mode 100644
index 3f9b49c..0000000
--- a/OLD/pages/product.ejs
+++ /dev/null
@@ -1,4 +0,0 @@
-${require('../components/pdp/pdp.html')}
-
-
-
diff --git a/api/cart_qty_update.php b/api/cart_qty_update.php
new file mode 100644
index 0000000..1a8e28b
--- /dev/null
+++ b/api/cart_qty_update.php
@@ -0,0 +1,42 @@
+<?php
+session_start();
+session_id(trim($_GET['sid']));
+include_once './config.php';
+include_once './database.php';
+
+header("Access-Control-Allow-Origin: *");
+header("Content-Type: application/json; charset=UTF-8");
+header("Access-Control-Allow-Methods: POST");
+header("Access-Control-Max-Age: 3600");
+header("Access-Control-Allow-Headers: Content-Type, Access-Control-Allow-Headers, Authorization, X-Requested-With");
+
+$databaseService = new DatabaseService();
+$conn = $databaseService->getConnection();
+
+$pid = trim($_POST['pid']);
+$price = trim($_POST['price']);
+$qty = trim($_POST['qty']);
+
+$exists = false;
+
+foreach($_SESSION['CART'] as $k => $item) {
+  if($item['pid'] == $pid) {
+    $_SESSION['CART'][$k]['qty'] = intval($qty);
+    $exists = true;
+  }
+}
+
+if(!$exists) {
+  $_SESSION['CART'][] = array("pid" => intval($pid), "price" => intval($price), "qty" => intval($qty));
+}
+
+//print_r($_SESSION['CART']);
+http_response_code(200);
+echo json_encode(
+  array(
+    "status" => 200,
+    "cart" => array_values($_SESSION['CART'])
+  ));
+
+?>
+
diff --git a/api/user_add.php b/api/user_add.php
index cfd7f7b..4fe5dcd 100644
--- a/api/user_add.php
+++ b/api/user_add.php
@@ -3,6 +3,7 @@ session_start();
 session_id(trim($_GET['sid']));
 include_once './config.php';
 include_once './database.php';
+include_once './send_mail.php';
 
 header("Access-Control-Allow-Origin: *");
 header("Content-Type: application/json; charset=UTF-8");
@@ -15,21 +16,61 @@ $conn = $databaseService->getConnection();
 
 $data = json_decode(file_get_contents("php://input"));
 
-$query = "INSERT INTO `users`
-          (`id`, `first_name`, `last_name`, `email`, `phone`, `address`, `city`, `zip_code`, `province`, `password`)
-          VALUES (NULL, '".trim($data->first_name)."', '".trim($data->last_name)."', '".trim($data->email)."',
-          '".trim($data->phone)."', '".trim($data->address)."', '".trim($data->city)."',
-          '".trim($data->zip_code)."', '".trim($data->province)."', '".md5(trim($data->password))."')";
-
+$query = "SELECT * FROM `users` WHERE email = '".trim($data->email)."'";
 $stmt = $conn->prepare($query);
 
+
+  $toEmail = trim($data->email);
+  $toName = trim($data->first_name)." ".trim($data->last_name);
+  $subject = 'IoLovOlio - Registrazione';
+  $body = emailHeader();
+
+  $body .= "<tr><td colspan=\"4\" style=\"padding: 10px 20px\">Ciao ".$data->first_name."<br>".
+            "Grazie per esserti registrato a IoLovOlio, di seguito un riepilogo dei tuoi dati:<br><br>".
+            "Nome: ".$data->first_name."<br>".
+            "Cognome: ".$data->last_name."<br>".
+            "Indirizzo: ".$data->address."<br>".
+            "Città: ".$data->city."<br>".
+            "CAP: ".$data->zip_code."<br><br>".
+            "Email/ID: ".$data->email."<br>".
+            "Password: ".$data->password."<br>".
+            "</td></tr>";
+
+  $body .= "<tr><td colspan=\"4\">Grazie,<br>Servizio Clienti Iolovolio<br><br></td></tr>";
+  $body .= emailFooter();
+
 if($stmt->execute()) {
-  http_response_code(200);
-  echo json_encode(
-    array(
-      "status" => 200,
-      "id" => $conn->lastInsertId()
-    ));
+
+  if($stmt->rowCount()) {
+    http_response_code(400);
+    echo json_encode(
+      array(
+        "status" => 400,
+        "message" => "User exists"
+      ));
+  } else {
+
+    $sent = sendEmail($toEmail, $toName, $subject, $body);
+    if($sent === true) {
+
+      $query = "INSERT INTO `users`
+            (`id`, `first_name`, `last_name`, `email`, `phone`, `address`, `city`, `zip_code`, `province`, `password`)
+            VALUES (NULL, '".trim($data->first_name)."', '".trim($data->last_name)."', '".trim($data->email)."',
+            '".trim($data->phone)."', '".trim($data->address)."', '".trim($data->city)."',
+            '".trim($data->zip_code)."', '".trim($data->province)."', '".md5(trim($data->password))."')";
+
+      $stmt = $conn->prepare($query);
+
+      if($stmt->execute()) {
+        http_response_code(200);
+        echo json_encode(
+          array(
+            "status" => 200,
+            "id" => $conn->lastInsertId()
+          ));
+      }
+    }
+  }
 } else {
   http_response_code(400);
   echo json_encode(
diff --git a/components/account/account.html b/components/account/account.html
index c90dc2d..bf39c1e 100644
--- a/components/account/account.html
+++ b/components/account/account.html
@@ -50,28 +50,94 @@
         }
       ?>
 
-      <div class="content col-12 col-md-8 mr-auto order-1 order-md-0">
-
       <?php
       if(!isset($_SESSION['AUTH'])) {
       ?>
-        <form class="login-form" action="/account/ordini" method="POST">
-          <div class="row">
-            <div class="col-12 col-md-6">
-              <span class="label">E-mail</span>
-              <input type="email" name="login_usr" class="input-text">
-            </div>
-            <div class="col-12 col-md-6">
-              <span class="label">Password</span>
-              <input type="password" name="login_pwd" class="input-text">
-            </div>
-            <div class="col-12 mt-4">
-              <button class="button button-brown button-big ml-auto">Accedi</button>
+      <div class="content col-12">
+        <div class="row">
+          <div class="col-12 col-md-4 mr-auto mb-5">
+            <span class="title">Sei già registrato?</span>
+            <form class="login-form" action="/account/ordini" method="POST">
+              <div class="row">
+                <div class="col-12">
+                  <span class="label">E-mail</span>
+                  <input type="email" name="login_usr" class="input-text">
+                </div>
+                <div class="col-12">
+                  <span class="label">Password</span>
+                  <input type="password" name="login_pwd" class="input-text">
+                </div>
+                <div class="col-12 mt-4">
+                  <button class="button button-brown button-big ml-auto">Accedi</button>
+                </div>
+              </div>
+            </form>
+          </div>
+          <div class="col-12 col-md-7">
+            <span class="title">Non sei registrato?</span>
+            <div class="row new-user-form">
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">Nome *</span>
+                <input type="text" name="first_name" class="input input-text" required>
+              </div>
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">Cognome *</span>
+                <input type="text" name="last_name" class="input input-text" required>
+              </div>
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">E-mail *</span>
+                <input type="email" name="email" class="input input-text" required>
+              </div>
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">Telefono</span>
+                <input type="tel" name="phone" class="input input-text">
+              </div>
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">Indirizzo *</span>
+                <input type="text" name="address" class="input input-text" required>
+              </div>
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">Città *</span>
+                <input type="text" name="city" class="input input-text" required>
+              </div>
+              <div class="col-12 col-md-4 pr-2 pr-md-4 mr-auto">
+                <span class="label">CAP *</span>
+                <input type="text" name="zip_code" class="input input-text" required>
+              </div>
+              <div class="col-12 col-md-4 pr-2 pr-md-4 mr-auto">
+                <span class="label">Provincia *</span>
+                <select name="province" class="input input-select" required>
+                  <?php
+                    foreach($PROV as $k => $p) {
+                      echo "<option value=\"".$k."\">".$p."</option>";
+                    }
+                  ?>
+                </select>
+              </div>
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">Scegli una password *</span>
+                <input type="password" name="password" class="input input-text" required>
+                <span class="font-10">deve essere di almeno 8 caratteri contenere almeno un numero, un carattere maiuscolo, uno minuscolo, sono consentiti i seguenti caratteri speciali: @$!%*#?&^+-</span>
+              </div>
+              <div class="col-12 col-md-6 pr-2 pr-md-4">
+                <span class="label">Conferma password *</span>
+                <input type="password" name="password_confirm" class="input input-text" required>
+              </div>
+
+              <div class="col-12 mt-4">
+                <button class="register button button-brown button-big ml-auto">Registrati</button>
+              </div>
             </div>
           </div>
-        </form>
+        </div>
+      </div>
+
       <?php
       } else {
+      ?>
+
+      <div class="content col-12 col-md-8 mr-auto order-1 order-md-0">
+        <?php
           if($getQ[1] == 'indirizzo') {
       ?>
         <form method="post">
@@ -201,7 +267,8 @@
               $p = mysqli_fetch_array($qp);
               ?>
               <div class="row no-gutters detail-row">
-                <div class="col-12">Prodotto: <?= $p['type'].' - '.$p['name'];?></div>
+                <div class="col-12 row-title"><?= $p['name'];?></div>
+                <!--<div class="col-12"><?= $p['type'];?></div>-->
                 <div class="col-12">Quantità: <?= $item->qty;?></div>
                 <div class="col-12">Prezzo: <?= money_format('%.2n', $item->price);?></div>
               </div>
@@ -211,13 +278,8 @@
           </div>
         </div>
 
-
-
         <?php
           }
-        ?>
-
-      <?php
         }
       }
       ?>
@@ -250,3 +312,4 @@
     </div>
   </div>
 </div>
+
diff --git a/components/account/account.js b/components/account/account.js
index 6b2c258..8faeb2f 100644
--- a/components/account/account.js
+++ b/components/account/account.js
@@ -7,6 +7,8 @@ $(document).ready( () => {
 
     const pwdform = component.find('#pwdform')
     const updatePassword = pwdform.find('.update-password')
+    const register = component.find('.register')
+    const registerForm = component.find('.new-user-form')
 
     const orders = component.find('.order-row')
 
@@ -35,6 +37,83 @@ $(document).ready( () => {
       checkForm()
     })
 
+    register.off('.click').on('click.click', () => {
+      const inputs = registerForm.find('.input')
+      const passwords = registerForm.find('.input[type="password"]')
+      let errors = 0
+
+      inputs.each( (i,e) => {
+        const input = $(e)
+        const type = input.prop('type')
+        const required = input.prop('required')
+
+        if(required) {
+          switch(type) {
+            case 'text':
+            case 'select-one':
+              if(['x_address', 'x_city', 'x_zip_code', 'x_province'].indexOf(input.prop('name')) > -1) {
+              } else {
+                if(!input.val().length) {
+                  input.addClass('error')
+                  errors++
+                } else { input.removeClass('error') }
+              }
+              break;
+            case 'email':
+              if(!/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/
+                  .test(input.val())) {
+                input.addClass('error')
+                errors++
+              } else { input.removeClass('error') }
+              break;
+            case 'password':
+              if(!/^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&^+-])[A-Za-z\d@$!%*#?&^+-]{8,}$/
+                  .test(input.val())) {
+                input.addClass('error')
+                errors++
+              } else { input.removeClass('error') }
+              break;
+            case 'checkbox':
+              if(!input.is(':checked')) {
+                input.closest('.checkbox').addClass('error')
+                errors++
+              } else {
+                input.closest('.checkbox').removeClass('error')
+              }
+              break;
+          }
+        }
+      })
+
+      if(passwords[0].value != passwords[1].value) {
+        $(passwords[1]).addClass('error')
+        errors++
+      } else {
+        $(passwords[1]).removeClass('error')
+      }
+
+      if(!errors) {
+        let body = {}
+        inputs.each( (i,e) => {
+          const input = $(e)
+          const type = input.prop('type')
+          const name = input.prop('name')
+          body[name] = input.val()
+        })
+
+        grecaptcha.ready(() => {
+          grecaptcha.execute(ENV.RECAPTCHA_SITE_KEY, {action: 'submit'}).then((token) => {
+            Apis.addUser(body).then( (data) => {
+              Apis.notification("Account aggiunto correttamente!<br>Riceverai una mail di conferma all'indirizzo indicato.")
+            }).catch( (error) => {
+              console.error(error)
+              Apis.notification("ATTENZIONE: L'utente che stai cercando di inserire è già presente nel database")
+            })
+          })
+        })
+      }
+    })
+
     const checkForm = () => {
       console.log('checkForm')
       const inputs = component.find('.input')
diff --git a/components/account/account.scss b/components/account/account.scss
index c435d7a..d1ed124 100644
--- a/components/account/account.scss
+++ b/components/account/account.scss
@@ -81,6 +81,11 @@
           border-bottom: 1px solid $black-alpha;
           padding: 10px 0;
 
+          .row-title {
+            @include font-style($font-serif, 'bold', $font-18);
+            color: $brown;
+          }
+
           &:last-of-type {
             border: none;
           }
@@ -88,6 +93,10 @@
       }
     }
 
+    .new-user-form {
+
+    }
+
   }
 
   .sections {
@@ -119,6 +128,17 @@
   }
 }
 
+@media (min-width: map-get($grid-breakpoints, 'md')) {
+  .component-account {
+    .content {
+      .new-user-form {
+        //border-left: 1px dotted $gray;
+      }
+    }
+  }
+}
+
+
 @keyframes blinker {
   0% { opacity: 1; }
   25% { opacity: .5; }
diff --git a/components/buy/buy.html b/components/buy/buy.html
index bab1784..908cf34 100644
--- a/components/buy/buy.html
+++ b/components/buy/buy.html
@@ -21,24 +21,24 @@
             </div>
           </div>
           <div class="col-12 col-md-6">
-            <span class="type"><?= $r['type'];?></span>
+            <span class="type">Olio extravergine d'oliva bio<!--<?= $r['type'];?>--></span>
             <span class="name"><?= $r['name'];?></span>
             <span class="description"><?= $r['description'];?></span>
             <div class="items">
               <div class="item">
-                <span class="label">Format</span>
+                <span class="label">Formato</span>
                 <span class="value"><?= $r['format'];?></span>
               </div>
               <div class="item">
                 <span class="label">Biologico</span>
-                <span class="value"><?= $r['bio'] ? 'Si' : 'No';?></span>
+                <span class="value"><?= $r['bio'] ? 'Sì' : 'No';?></span>
               </div>
               <div class="item">
                 <span class="label">Annata</span>
                 <span class="value"><?= $r['year'];?></span>
               </div>
             </div>
-            <span class="price"><?= money_format('%.2n',$r['price']);?></span>
+            <span class="price"><?= money_format('%.2n',$r['price']);?> &euro;</span>
 
             <div class="add-container">
               <div class="qty-container">
@@ -73,9 +73,9 @@
           <div class="box">
             <a href="/acquistare/<?= $r['id'];?>/<?= $r['name'];?>">
               <img class="image" src="<?= '/images/products/'.$r['id'].'.png';?>">
-              <span class="type"><?= $r['type'];?></span>
+              <span class="type">Olio extravergine d'oliva bio<!--<?= $r['type'];?>--></span>
               <span class="name"><?= $r['name'];?></span>
-              <span class="price"><?= money_format('%.2n',$r['price']);?></span>
+              <span class="price"><?= money_format('%.2n',$r['price']);?> &euro;</span>
             </a>
           </div>
         </div>
@@ -90,17 +90,18 @@
   <div class="add-modal">
     <div class="modal-content">
       <div class="row">
-        <div class="col-6 d-flex">
+        <div class="col-6 d-none d-md-flex">
           <img class="image m-auto" src="">
         </div>
-        <div class="col-6 d-flex">
-          <div class="my-auto">
+        <div class="col-12 col-md-6 d-flex">
+          <div class="w-100 my-auto">
             <span class="title">articolo aggiunto al carrello</span>
             <span class="name"></span>
             <span class="qty"></span>
             <span class="total"></span>
             <a href="/carrello" class="goto button button-brown mt-4 mb-2">concludi ordine</a>
-            <button class="close button button-white w-100">continua gli acquisti</button>
+            <a href="/acquistare" class="goto button button-white w-100">continua gli acquisti</a>
+            <!--<button class="close button button-white w-100">continua gli acquisti</button>-->
           </div>
         </div>
       </div>
diff --git a/components/buy/buy.scss b/components/buy/buy.scss
index e0d7959..cfb5824 100644
--- a/components/buy/buy.scss
+++ b/components/buy/buy.scss
@@ -2,7 +2,6 @@
 @import "../../src/scss/mixins.scss";
 
 .component-buy {
-  padding: 30px 0;
 
   .content {
     width: 100%;
@@ -248,6 +247,7 @@
 
 @media (min-width: map-get($grid-breakpoints, 'md')) {
   .component-buy {
+    padding: 30px 0;
     .content {
       .details {
         .image-container{
diff --git a/components/cart/cart.html b/components/cart/cart.html
index f13cbaa..87dfe7f 100644
--- a/components/cart/cart.html
+++ b/components/cart/cart.html
@@ -13,11 +13,11 @@
     <div class="container">
       <div class="list">
 
-        <div class="row mx-0 header">
+        <div class="row mx-0 header d-none d-sm-flex">
           <div class="col-2 col-md-1 ml-auto d-none d-sm-block"></div>
           <div class="col-4 col-md-3"> Prodotto </div>
+          <div class="col-2 col-md-2"> Quantità </div>
           <div class="col-2 col-md-1"> Prezzo </div>
-          <div class="col-2 col-md-1"> Quantità </div>
           <div class="col-2 col-md-1"> Totale </div>
           <div class="col-2 col-md-1 mr-auto"></div>
         </div>
@@ -31,25 +31,30 @@
             $total += $item['price'] * $item['qty'];
         ?>
 
-        <div class="row mx-0 item" data-pid="<?= $r['id'];?>">
+        <div class="row mx-0 item" data-pid="<?= $r['id'];?>" data-price="<?= $r['id'];?>">
           <div class="item-col col-2 col-md-1 ml-auto pl-0 d-none d-sm-block">
             <div class="image-container">
               <img class="image" src="/images/products/<?= $r['id'];?>.png">
             </div>
           </div>
-          <div class="item-col col-4 col-md-3 py-3">
-            <?= $r['type']." - ".$r['name'];?>
+          <div class="item-col col-12 col-md-3 pt-2 pb-3">
+            <span class="name"><?= $r['name']?></span>
+            <?= $r['type'];?>
           </div>
-          <div class="item-col col-2 col-md-1 py-3">
-            <?= money_format('%.2n',$r['price']);?>
+          <div class="item-col col-4 col-md-2 pt-2 pb-3">
+            <span class="qty-box">
+              <button class="qty-minus icon-minus"></button>
+              <input type="text" class="qty-input" pattern="[0-9]+" value="<?= $item['qty'];?>">
+              <button class="qty-plus icon-plus"></button>
+            </span>
           </div>
-          <div class="item-col col-2 col-md-1 py-3">
-            <?= $item['qty'];?>
+          <div class="item-col col-3 col-md-1 pt-2 pb-3">
+            <?= money_format('%.2n',$r['price']);?> &euro;
           </div>
-          <div class="item-col col-2 col-md-1 py-3">
-            <?= money_format('%.2n',$r['price'] * $item['qty']);?>
+          <div class="item-col col-3 col-md-1 pt-2 pb-3 partial">
+            <?= money_format('%.2n',$r['price'] * $item['qty']);?> &euro;
           </div>
-          <div class="item-col col-2 col-md-1 mr-auto pr-0 py-3 text-center">
+          <div class="item-col col-2 col-md-1 mr-auto pr-0 pt-1 pb-3 text-center">
             <button class="remove icon-close"></button>
           </div>
         </div>
@@ -59,10 +64,10 @@
         ?>
 
         <div class="row mx-0 place py-4">
-          <div class="col-10 col-md-8 mx-auto">
+          <div class="col-10 col-md-9 mx-auto">
             <span class="total">
               Subtotale
-              <span class="price"><?= money_format('%.2n',$total);?></span>
+              <span class="price"><?= money_format('%.2n',$total);?> &euro;</span>
             </span>
             <span class="tax">tasse incluse</span>
 
diff --git a/components/cart/cart.js b/components/cart/cart.js
index b45b142..bbffbd9 100644
--- a/components/cart/cart.js
+++ b/components/cart/cart.js
@@ -12,7 +12,12 @@ $(document).ready( () => {
     items.each( (i,e) => {
       const item = $(e)
       const pid = item.data('pid')
+      const partial = item.data('price')
       const remove = item.find('.remove')
+      const plus = item.find('.qty-plus')
+      const minus = item.find('.qty-minus')
+      const input = item.find('.qty-input')
+      const partialValue = item.find('.partial')
 
       remove.off('.click').on('click.click', () => {
         Apis.removeFromCart(pid).then( (data) => {
@@ -35,6 +40,59 @@ $(document).ready( () => {
         })
       })
 
+      plus.off('.click').on('click.click', () => {
+        input.val(parseInt(input.val())+1)
+        Apis.updateCartQty(pid, partial, input.val()).then( (data) => {
+
+          const item = data.cart.find(item => item.pid == pid)
+          if(data.cart.length) {
+            const headerCart = $('.component-header .cart-cta .counter')
+            if(headerCart.length) {
+              headerCart.text(data.cart.length)
+            }
+            let total = 0
+            let part = item.price * item.qty
+            $.each(data.cart, (i, e) => {
+              total += parseFloat(e.price) * parseInt(e.qty)
+            })
+            price.text(new Intl.NumberFormat('it-IT', { style: 'currency', currency: 'EUR'}).format(total))
+            partialValue.text(new Intl.NumberFormat('it-IT', { style: 'currency', currency: 'EUR'}).format(part))
+          } else {
+            window.location = '/acquistare'
+          }
+        }).catch( (error) => {
+          console.error(error)
+        })
+      })
+
+      minus.off('.click').on('click.click', () => {
+        if(input.val() == 1) {
+          remove.trigger('click')
+        } else {
+        input.val(parseInt(input.val())-1)
+          Apis.updateCartQty(pid, partial, input.val()).then( (data) => {
+            const item = data.cart.find(item => item.pid == pid)
+            if(data.cart.length) {
+              const headerCart = $('.component-header .cart-cta .counter')
+              if(headerCart.length) {
+                headerCart.text(data.cart.length)
+              }
+              let total = 0
+              let part = item.price * item.qty
+              $.each(data.cart, (i, e) => {
+                total += parseFloat(e.price) * parseInt(e.qty)
+              })
+              price.text(new Intl.NumberFormat('it-IT', { style: 'currency', currency: 'EUR'}).format(total))
+              partialValue.text(new Intl.NumberFormat('it-IT', { style: 'currency', currency: 'EUR'}).format(part))
+            } else {
+              window.location = '/acquistare'
+            }
+          }).catch( (error) => {
+            console.error(error)
+          })
+        }
+      })
+
     })
   }
 })
diff --git a/components/cart/cart.scss b/components/cart/cart.scss
index feb78a0..10ca16d 100644
--- a/components/cart/cart.scss
+++ b/components/cart/cart.scss
@@ -5,18 +5,18 @@
   padding: 10px 0 40px 0;
 
   .header {
-    @include font-style($font-sans, 700, $font-10);
+    @include font-style($font-sans, 700, $font-12);
     color: $gray;
     padding: 20px 0;
   }
 
   .item {
-    @include font-style($font-sans, 400, $font-10);
+    @include font-style($font-sans, 400, $font-12);
     color: $gray;
 
     .item-col {
       border-bottom: 1px solid $black-alpha;
-      padding-top: 10px;
+      padding-top: 20px;
       padding-bottom: 10px;
 
       .image-container {
@@ -31,11 +31,61 @@
         }
       }
 
+      .name {
+        display: block;
+        @include font-style($font-serif, 500, $font-20);
+        color: $brown;
+        margin-bottom: 2px;
+      }
+
       .remove {
         font-size: $font-22;
         padding: 0;
         background: none;
       }
+
+      .qty-box {
+        display: block;
+        position: relative;
+        height: 30px;
+        width: 100%;
+        max-width: 100px;
+        background: $white;
+
+        .qty-minus,
+        .qty-plus {
+          position: absolute;
+          top: 50%;
+          height: 30px;
+          width: 20px;
+          line-height: 30px;
+          color: $gray;
+          font-size:$font-16;
+          text-align: center;
+          transform: translateY(-50%);
+          cursor: pointer;
+          padding: 0;
+        }
+        .qty-minus {
+          left: 5px;
+        }
+        .qty-plus {
+          right: 5px;
+        }
+
+        .qty-input {
+          position: absolute;
+          top: 50%;
+          left: 25px;
+          height: 100%;
+          width: calc(100% - 50px);
+          text-align: center;
+          transform: translateY(-50%);
+          border: none;
+          color: $brown;
+          @include font-style($font-serif, 400, $font-18);
+        }
+      }
     }
 
     &:last-of-type {
diff --git a/components/checkout/checkout.html b/components/checkout/checkout.html
index 08c45a2..5cac8e5 100644
--- a/components/checkout/checkout.html
+++ b/components/checkout/checkout.html
@@ -183,13 +183,14 @@
         ?>
         <div class="row item">
           <div class="col-6 pl-0">
-            <?= $r['type']." - ".$r['name'];?>
+            <span class="name"><?= $r['name']?></span>
+            <span class="description"><?= $r['type'];?></span>
           </div>
-          <div class="col-3 text-right">
+          <div class="col-3 text-right pt-1">
             <?= $item['qty'];?>
           </div>
-          <div class="col-3 text-right pr-0">
-            <?= money_format('%.2n',$r['price'] * $item['qty']);?>
+          <div class="col-3 text-right pr-0 pt-1">
+            <?= money_format('%.2n',$r['price'] * $item['qty']);?> &euro;
           </div>
         </div>
         <?php
@@ -201,7 +202,7 @@
             Costi di spedizione
           </div>
           <div class="col-6 text-right pr-0">
-            <?= money_format('%.2n', 10);?>
+            <?= money_format('%.2n', 10);?> &euro;
           </div>
         </div>
 
@@ -210,7 +211,7 @@
             Totale tasse incluse
           </div>
           <div class="col-6 text-right pr-0">
-            <?= money_format('%.2n', $total + 10);?>
+            <?= money_format('%.2n', $total + 10);?> &euro;
           </div>
         </div>
 
@@ -242,4 +243,3 @@
     </div>
   </div>
 </div>
-
diff --git a/components/checkout/checkout.js b/components/checkout/checkout.js
index d95c932..28615d7 100644
--- a/components/checkout/checkout.js
+++ b/components/checkout/checkout.js
@@ -133,7 +133,12 @@ $(document).ready( () => {
           }
         })
 
-        placeOrder(body, isNewUser)
+        grecaptcha.ready(() => {
+          grecaptcha.execute(ENV.RECAPTCHA_SITE_KEY, {action: 'submit'}).then((token) => {
+            placeOrder(body, isNewUser)
+          })
+        })
+
 
       }
     }
diff --git a/components/checkout/checkout.scss b/components/checkout/checkout.scss
index 61f686e..54052e8 100644
--- a/components/checkout/checkout.scss
+++ b/components/checkout/checkout.scss
@@ -42,18 +42,32 @@
   .total {
     @include font-style($font-sans, 400, $font-16);
     color: $gray;
-    padding: 20px 0;
+    padding: 20px 10px;
     border-bottom: 1px solid $gray;
+
+    .name {
+      display: block;
+      @include font-style($font-serif, 500, $font-22);
+      color: $brown;
+      margin-bottom: 2px;
+    }
+
+    .description {
+      display: block;
+      font-size: $font-14;
+    }
   }
 
   .total {
     border: none;
     font-weight: 700;
+    padding: 20px 10px;
   }
 
   .place {
     @include font-style($font-sans, 400, $font-16);
     color: $gray;
+    padding: 0 10px;
 
     .link {
       padding: 0;
@@ -83,3 +97,17 @@
     display: none;
   }
 }
+
+@media (min-width: map-get($grid-breakpoints, 'md')) {
+  .component-checkout {
+    .item {
+      padding: 20px 0;
+    }
+    .place {
+      padding: 0;
+    }
+    .total {
+      padding: 20px 0;
+    }
+  }
+}
diff --git a/components/content/content-learn.html b/components/content/content-learn.html
index 831e3bf..834c5ef 100644
--- a/components/content/content-learn.html
+++ b/components/content/content-learn.html
@@ -14,9 +14,16 @@
     <div class="row">
       <div class="col-12 col-sm-10 col-md-6 mx-auto">
         <p class="paragraph">
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla lobortis diam turpis, in pulvinar augue cursus ut. Donec in felis et metus semper condimentum vel id sem. Duis vestibulum purus ut dui suscipit, sit amet sodales lacus auctor. Praesent et bibendum massa.
+          Siete a tavola con amici, o poco prima quando si è in cucina a impiattare.<br>
+          Le voci si accavallano. Si parla di cibo, come sempre.<br>
+          Questa volta di olio.<br>
           <br><br>
-          Duis bibendum rutrum augue, et sollicitudin risus tempor at. Fusce eget varius diam. Suspendisse molestie odio est, vel egestas diam aliquet et. Quisque blandit turpis magna, id cursus nisi luctus ac.
+          "Provate questo, sentite come è crudo."<br>
+          "Vi devo far assaggiare quello che mi mandano i miei da giù."<br>
+          "Il mio preferito rimane quello ligure."<br>
+          Questa scena l’abbiamo vissuta tante volte, forse anche voi.<br>
+          Per questo abbiamo creato Iolovolio, una piattaforma dove poter progettare e produrre il proprio olio definendo il blend, i tempi di raccolta, la filtratura...<br>
+          Tutte quelle variabili che ne determinano sapore e consistenza per creare un olio unico, il tuo.
         </p>
       </div>
     </div>
diff --git a/components/content/content-recount-index.html b/components/content/content-recount-index.html
index b128794..41d762e 100644
--- a/components/content/content-recount-index.html
+++ b/components/content/content-recount-index.html
@@ -12,7 +12,7 @@
         <a href="/due-cucchiai-di-salute">
           <img class="image mb-0" src="/images/recount-1.png">
           <h4 class="subtitle">Due cucchiai di salute</h3>
-          <p class="paragraph font-18">
+          <p class="paragraph">
             Non un semplice condimento ma un vero alimento: così va considerato l'olio extravergine d'oliva. Più precisamente va considerato un alimento funzionale, cioè uno di quei pochi che preservano e migliorano la salute dell'uomo.
           </p>
         </a>
@@ -21,7 +21,7 @@
         <a href="/un-olio-da-strippare">
           <img class="image mb-0" src="/images/recount-2.png">
           <h4 class="subtitle">Un olio… da strippare</h3>
-          <p class="paragraph font-18">
+          <p class="paragraph">
             Assaggiare l'olio è fondamentale per riconoscere quello di qualità: ecco qualche consiglio ispirato alla tecnica dei sommelier dell'extravergine.
           </p>
         </a>
@@ -30,7 +30,7 @@
         <a href="/le-variabili-del-gusto">
           <img class="image mb-0" src="/images/recount-3.png">
           <h4 class="subtitle">Le variabili del gusto</h3>
-          <p class="paragraph font-18">
+          <p class="paragraph">
             Che cosa determina i profumi e il sapore di un extravergine? Dall'oliva all'estrazione dell'olio, ecco come influiscono i diversi momenti della produzione
           </p>
         </a>
diff --git a/components/content/content.scss b/components/content/content.scss
index 6e1ff88..aca8a20 100644
--- a/components/content/content.scss
+++ b/components/content/content.scss
@@ -24,7 +24,7 @@
 
   .paragraph {
     display: block;
-    @include font-style($font-sans, 'regular', $font-18);
+    @include font-style($font-sans, 'regular', $font-16);
     color: $gray;
     padding: 0;
     margin: 0 0 30px 0;
diff --git a/components/header/header.html b/components/header/header.html
index 0fa6a2f..8f9ca36 100644
--- a/components/header/header.html
+++ b/components/header/header.html
@@ -3,7 +3,7 @@
   <div class="container header-wrapper">
 
     <a href="/">
-      <img class="logo" src="/images/logoHeader.png">
+      <img class="logo" src="/images/logoHeader.svg">
     </a>
 
     <div class="ctas">
@@ -18,7 +18,7 @@
             if($_SESSION['AUTH']) {
               echo $_SESSION['AUTH']['first_name'].' '.$_SESSION['AUTH']['last_name'];
             } else {
-              echo "Log-in";
+              echo "Area utente";
             }
           ?>
         </span>
@@ -49,9 +49,11 @@
         <li class="item <?php if($getQ[0] == 'acquistare') { echo "active";}?>">
           <a href="/acquistare" class="label">acquistare</a>
         </li>
+        <!--
         <li class="item <?php if($getQ[0] == 'raccontare') { echo "active";}?>">
           <a href="/raccontare" class="label">raccontare</a>
         </li>
+        -->
       </ul>
     </nav>
   </div>
diff --git a/components/header/header.scss b/components/header/header.scss
index 4b0c6bd..084b3f2 100644
--- a/components/header/header.scss
+++ b/components/header/header.scss
@@ -18,23 +18,24 @@
 
     .logo {
       position: absolute;
-      top: 50%;
+      top: 32px;
       left: 50%;
       height: 100%;
       max-height: 50px;
       margin: auto 0;
-      transition: max-height .4s;
-      transform: translate(-50%, -50%);
+      transition: max-height .4s, top .3s;
+      transform: translateX(-50%);
     }
 
 
     .ctas {
       position: absolute;
-      top: 20px;
+      top: 28px;
       left: 20px;
       font-size: $font-34;
       padding: 0 !important;
       color: $black;
+      transition: top .3s;
 
       .cart-cta,
       .account-cta {
@@ -64,11 +65,11 @@
 
     }
 
-
     .hamburger {
       position: absolute;
-      top: 20px;
+      top: 32px;
       right: 20px;
+      transition: top .3s;
     }
 
     .menu-container {
@@ -137,7 +138,17 @@
       min-height: $header-height-mobile-sticky;
       .logo {
         max-height: 50px;
+        top: 18px;
+      }
+
+      .ctas {
+        top: 14px;
       }
+
+      .hamburger {
+        top: 18px;
+      }
+
       .menu-container {
         .menu-label {
           opacity: 0;
diff --git a/components/homeTemplate/homeTemplate.html b/components/homeTemplate/homeTemplate.html
index 86b0ed8..5513de9 100644
--- a/components/homeTemplate/homeTemplate.html
+++ b/components/homeTemplate/homeTemplate.html
@@ -6,6 +6,30 @@
     <button class="scroll icon-angle-down"></button>
   </div>
 
+  <div class="bio">
+    <div class="container">
+      <div class="row no-gutters py-4">
+        <div class="col-12 col-md-5 d-flex">
+          <img class="main-image" src="/images/homeDescription.png">
+        </div>
+        <div class="col-12 col-sm-8 col-md-7 mx-auto d-flex">
+          <div class="description">
+            <img class="logo" src="/images/logoHeader.png">
+            <span class="d-block text-left">
+              Siete a tavola con amici, o poco prima quando si è in cucina a impiattare.<br>
+              Le voci si accavallano. Si parla di cibo, come sempre.<br>
+              Questa volta di olio.<br>
+              "Provate questo, sentite come è crudo."<br>
+              "Vi devo far assaggiare quello che mi mandano i miei da giù."<br>
+              "Il mio preferito rimane quello ligure."
+            </span>
+
+            <a class="goto button button-transparent" href="/conoscere">Leggi di più</a>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <div class="products">
     <div class="container">
       <div class="row py-4">
@@ -26,7 +50,7 @@
                 <div class="col-12 col-md-5">
                   <div class="description">
                     <span class="title"><?= $r['name'];?></span>
-                    <span class="subtitle"><?= $r['description'];?></span>
+                    <span class="subtitle"><?= $r['type'];?></span>
                     <a class="link" href="/acquistare/<?= $r['id'];?>/<?= $r['name'];?>">
                       <span class="icon icon-buy"></span>
                       <span class="label">acquista</span>
@@ -44,28 +68,6 @@
     </div>
   </div>
 
-
-  <div class="bio">
-    <div class="container">
-      <div class="row no-gutters py-4">
-        <div class="col-12 col-md-5 d-flex">
-          <img class="main-image" src="/images/homeDescription.png">
-        </div>
-        <div class="col-12 col-sm-8 col-md-7 mx-auto d-flex">
-          <div class="description">
-            <img class="logo" src="/images/logoHeader.png">
-            <span class="d-block text-left">
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla lobortis diam turpis, in pulvinar augue cursus ut. Donec in felis et metus semper condimentum vel id sem. Duis vestibulum purus ut dui suscipit, sit amet sodales lacus auctor. Praesent et bibendum massa.
-            <br><br>
-            Duis bibendum rutrum augue, et sollicitudin risus tempor at. Fusce eget varius diam. Suspendisse molestie odio est, vel egestas diam aliquet et. Quisque blandit turpis magna, id cursus nisi luctus ac.
-            </span>
-
-            <a class="goto button button-transparent" href="/conoscere">Leggi di più</a>
-        </div>
-      </div>
-    </div>
-  </div>
-
   <?php
     @include('components/content/content-recount-index.php');
   ?>
diff --git a/components/homeTemplate/homeTemplate.scss b/components/homeTemplate/homeTemplate.scss
index c85d79a..5b2ed18 100644
--- a/components/homeTemplate/homeTemplate.scss
+++ b/components/homeTemplate/homeTemplate.scss
@@ -39,6 +39,7 @@
   }
 
   .products {
+    margin: 100px 0;
     background: linear-gradient(0deg, $white 0%, $white 35%, $light-gray 35%, $light-gray 75%, $white 75%, $white 100%);
 
     .main-image {
diff --git a/deploy.sh b/deploy.sh
index c407f49..3d7f59e 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -4,7 +4,7 @@
 BASE="/"
 
 BASE_PARSED=$(echo $BASE | sed 's/\//\\\//g')
-
+yarn prod
 cd public
 for f in *.php
 do
@@ -14,6 +14,6 @@ do
 done
 cd ..
 
-rsync -avz --delete --exclude '/cgi-bin/conn.conn' --exclude '/admin/.htaccess' --exclude '/api'  -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@35.158.100.246:/var/www/iolovolio.com/
-rsync -avz --delete --exclude '/config.php' --exclude '/vendor' -e "ssh -i ./auth/marketmind.pem" ./api/* ubuntu@35.158.100.246:/var/www/iolovolio.com/api/
+rsync -avz --delete --exclude '/cgi-bin/conn.conn' --exclude '/admin/.htaccess' --exclude '/api'  -e "ssh -i ./auth/marketmind.pem" ./public/* ubuntu@18.194.83.82:/var/www/iolovolio.com/
+rsync -avz --delete --exclude '/config.php' --exclude '/vendor' -e "ssh -i ./auth/marketmind.pem" ./api/* ubuntu@18.194.83.82:/var/www/iolovolio.com/api/
 
diff --git a/images/logoHeader.svg b/images/logoHeader.svg
new file mode 100644
index 0000000..ae1d269
--- /dev/null
+++ b/images/logoHeader.svg
@@ -0,0 +1,43 @@
+<svg width="224" height="74" viewBox="0 0 224 74" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.6673 19.1221H-0.00012207V19.7982H3.90158V46.6736H-0.00012207V47.3497H14.569V46.6736H10.6673V19.1221Z" fill="#383920"/>
+<path d="M6.87145 8.19513C9.17612 8.19513 10.926 6.48781 10.926 4.14025C10.9686 1.83537 9.17612 0 6.87145 0C4.56678 0 2.73158 1.83537 2.73158 4.14025C2.77426 6.48781 4.60946 8.19513 6.87145 8.19513Z" fill="#383920"/>
+<path d="M26.2946 34.7334C24.3392 27.7997 23.8716 21.5892 25.572 19.1221C19.6208 21.2489 16.3902 26.8214 16.3902 33.3296C16.3902 41.4118 22.1288 48.2603 31.2255 48.2603C32.0757 48.2603 32.9259 48.2178 33.691 48.0901C31.0555 46.7289 28.165 41.3267 26.2946 34.7334Z" fill="#383920"/>
+<path d="M30.6931 18.2114C29.8429 18.2114 29.0353 18.254 28.2276 18.3816C30.8631 19.7428 33.7537 25.145 35.624 31.7384C37.5794 38.672 38.047 44.8825 36.3467 47.3497C42.2978 45.2228 45.5284 39.6504 45.5284 33.1421C45.5284 25.0174 39.8748 18.2114 30.6931 18.2114Z" fill="#383920"/>
+<path d="M77.2864 34.7334C75.3311 27.7997 74.8635 21.5892 76.5638 19.1221C70.6127 21.2489 67.382 26.8214 67.382 33.3296C67.382 41.4118 73.1206 48.2603 82.2174 48.2603C83.0675 48.2603 83.9177 48.2178 84.6829 48.0901C82.0473 46.7289 79.1568 41.3267 77.2864 34.7334Z" fill="#92704F"/>
+<path d="M82.4657 18.2114C81.6603 18.2114 80.8952 18.254 80.13 18.3816C82.6268 19.7428 85.3652 25.145 87.1371 31.7384C88.9896 38.672 89.4326 44.8825 87.8217 47.3497C93.4597 45.2228 96.5203 39.6504 96.5203 33.1421C96.5203 25.0174 91.1642 18.2114 82.4657 18.2114Z" fill="#92704F"/>
+<path d="M142.693 18.2114C141.843 18.2114 141.035 18.254 140.228 18.3816C142.863 19.7428 145.754 25.145 147.624 31.7384C149.579 38.672 150.047 44.8825 148.347 47.3497C154.298 45.2228 157.529 39.6504 157.529 33.1421C157.529 25.0174 151.875 18.2114 142.693 18.2114Z" fill="#383920"/>
+<path d="M138.295 34.7334C136.339 27.7997 135.872 21.5892 137.572 19.1221C131.621 21.2489 128.39 26.8214 128.39 33.3296C128.39 41.4118 134.129 48.2603 143.226 48.2603C144.076 48.2603 144.926 48.2178 145.691 48.0901C143.056 46.7289 140.165 41.3267 138.295 34.7334Z" fill="#383920"/>
+<path d="M224 33.1421C224 25.06 218.346 18.2114 209.165 18.2114C208.314 18.2114 207.507 18.254 206.699 18.3816C209.335 19.7428 212.225 25.145 214.096 31.7384C216.051 38.672 216.519 44.8825 214.818 47.3497C220.727 45.1802 224 39.6078 224 33.1421Z" fill="#383920"/>
+<path d="M204.766 34.7334C202.811 27.7997 202.343 21.5892 204.044 19.1221C198.092 21.2489 194.862 26.8214 194.862 33.3296C194.862 41.4118 200.6 48.2603 209.697 48.2603C210.547 48.2603 211.397 48.2178 212.163 48.0901C209.527 46.7289 206.637 41.3267 204.766 34.7334Z" fill="#383920"/>
+<path d="M61.6592 0H50.9918V0.676423H54.8935V46.6732H50.9918V47.3496H65.5609V46.6732H61.6592V0Z" fill="#92704F"/>
+<path d="M116.553 19.7824H122.567L114.605 39.7976H114.435L106.177 19.7824H110.2V19.1221H96.5203V19.7824H98.7226L110.708 47.3497H112.318L123.371 19.7824H125.658V19.1221H116.553V19.7824Z" fill="#92704F"/>
+<path d="M170.017 0H159.35V0.676423H163.251V46.6732H159.35V47.3496H173.919V46.6732H170.017V0Z" fill="#383920"/>
+<path d="M187.348 19.1221H176.65V19.7982H180.522V46.6736H176.65V47.3497H191.22V46.6736H187.348V19.1221Z" fill="#383920"/>
+<path d="M184.433 8.19513C186.738 8.19513 188.488 6.48781 188.488 4.14025C188.488 1.83537 186.738 0 184.433 0C182.128 0 180.293 1.83537 180.293 4.14025C180.335 6.48781 182.128 8.19513 184.433 8.19513Z" fill="#383920"/>
+<path d="M34.2412 71.108C33.5734 71.108 32.9935 70.9807 32.5014 70.7262C32.0093 70.4634 31.6271 70.0939 31.3547 69.6176C31.0911 69.1413 30.9593 68.5829 30.9593 67.9423C30.9593 67.3018 31.0999 66.7475 31.3811 66.2794C31.671 65.8114 32.0621 65.45 32.5541 65.1955C33.055 64.9409 33.6173 64.8136 34.2412 64.8136C34.8651 64.8136 35.423 64.9409 35.9151 65.1955C36.4071 65.4418 36.7938 65.7991 37.0749 66.2671C37.3649 66.7352 37.5099 67.2936 37.5099 67.9423C37.5099 68.5911 37.3737 69.1536 37.1013 69.6299C36.8377 70.098 36.4599 70.4634 35.9678 70.7262C35.4845 70.9807 34.909 71.108 34.2412 71.108ZM34.2412 70.8617C34.5487 70.8617 34.7948 70.7795 34.9793 70.6153C35.1638 70.4511 35.2956 70.1596 35.3747 69.7407C35.4626 69.3219 35.5065 68.7307 35.5065 67.967C35.5065 67.1951 35.4626 66.5997 35.3747 66.1809C35.2956 65.7621 35.1638 65.4706 34.9793 65.3063C34.7948 65.1421 34.5487 65.06 34.2412 65.06C33.9337 65.06 33.6832 65.1421 33.4899 65.3063C33.3054 65.4706 33.1692 65.7621 33.0813 66.1809C33.0022 66.5997 32.9627 67.1951 32.9627 67.967C32.9627 68.7307 33.0022 69.3219 33.0813 69.7407C33.1692 70.1596 33.3054 70.4511 33.4899 70.6153C33.6832 70.7795 33.9337 70.8617 34.2412 70.8617Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M38.0769 70.9233V70.8001L38.235 70.7508C38.5513 70.6523 38.7095 70.447 38.7095 70.1349V63.5449C38.7095 63.3807 38.6744 63.2575 38.6041 63.1754C38.5338 63.085 38.4108 63.0193 38.235 62.9783L38.0637 62.9413V62.8181L40.4757 62.2885L40.6338 62.3993L40.5811 64.1238V68.3365C40.5811 68.6404 40.5811 68.9442 40.5811 69.248C40.5899 69.5437 40.5943 69.8393 40.5943 70.1349C40.5943 70.2992 40.6294 70.4346 40.6997 70.5414C40.77 70.6399 40.8886 70.7139 41.0556 70.7631L41.2269 70.8001V70.9233H38.0769Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M43.3902 64.1731C43.0915 64.1731 42.8367 64.0869 42.6258 63.9144C42.4237 63.7338 42.3226 63.5079 42.3226 63.2369C42.3226 62.9577 42.4237 62.7319 42.6258 62.5595C42.8367 62.387 43.0915 62.3008 43.3902 62.3008C43.689 62.3008 43.9394 62.387 44.1415 62.5595C44.3436 62.7319 44.4447 62.9577 44.4447 63.2369C44.4447 63.5079 44.3436 63.7338 44.1415 63.9144C43.9394 64.0869 43.689 64.1731 43.3902 64.1731ZM41.835 70.9233V70.8001L42.0195 70.7508C42.1952 70.7015 42.3139 70.6276 42.3754 70.5291C42.4457 70.4305 42.4808 70.2992 42.4808 70.1349V66.2794C42.4808 66.107 42.4457 65.9797 42.3754 65.8976C42.3139 65.8073 42.1952 65.7457 42.0195 65.7128L41.835 65.6759V65.5527L44.247 64.8259L44.3788 64.9491L44.3392 66.6983V70.1472C44.3392 70.3115 44.37 70.4429 44.4315 70.5414C44.5018 70.6399 44.6204 70.7139 44.7874 70.7631L44.9192 70.8001V70.9233H41.835Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M48.8373 71.108C48.1695 71.108 47.5896 70.9807 47.0975 70.7262C46.6054 70.4634 46.2232 70.0939 45.9508 69.6176C45.6872 69.1413 45.5554 68.5829 45.5554 67.9423C45.5554 67.3018 45.696 66.7475 45.9772 66.2794C46.2671 65.8114 46.6582 65.45 47.1502 65.1955C47.6511 64.9409 48.2134 64.8136 48.8373 64.8136C49.4612 64.8136 50.0191 64.9409 50.5112 65.1955C51.0033 65.4418 51.3899 65.7991 51.6711 66.2671C51.961 66.7352 52.106 67.2936 52.106 67.9423C52.106 68.5911 51.9698 69.1536 51.6974 69.6299C51.4338 70.098 51.056 70.4634 50.5639 70.7262C50.0806 70.9807 49.5051 71.108 48.8373 71.108ZM48.8373 70.8617C49.1448 70.8617 49.3909 70.7795 49.5754 70.6153C49.7599 70.4511 49.8917 70.1596 49.9708 69.7407C50.0587 69.3219 50.1026 68.7307 50.1026 67.967C50.1026 67.1951 50.0587 66.5997 49.9708 66.1809C49.8917 65.7621 49.7599 65.4706 49.5754 65.3063C49.3909 65.1421 49.1448 65.06 48.8373 65.06C48.5298 65.06 48.2793 65.1421 48.086 65.3063C47.9015 65.4706 47.7653 65.7621 47.6774 66.1809C47.5984 66.5997 47.5588 67.1951 47.5588 67.967C47.5588 68.7307 47.5984 69.3219 47.6774 69.7407C47.7653 70.1596 47.9015 70.4511 48.086 70.6153C48.2793 70.7795 48.5298 70.8617 48.8373 70.8617Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M58.8635 64.8136C59.4346 64.8136 59.9223 64.9245 60.3265 65.1462C60.7307 65.3597 61.0382 65.6553 61.2491 66.0331C61.4688 66.4026 61.5786 66.8255 61.5786 67.3018C61.5786 67.3922 61.5742 67.4866 61.5654 67.5851C61.5566 67.6755 61.5391 67.7576 61.5127 67.8315H57.585C57.5938 68.7184 57.7607 69.3589 58.0858 69.7531C58.4197 70.139 58.9118 70.332 59.562 70.332C60.0014 70.332 60.3572 70.2663 60.6296 70.1349C60.902 70.0035 61.1568 69.8105 61.3941 69.556L61.5259 69.6668C61.2535 70.1185 60.8888 70.4716 60.4319 70.7262C59.9838 70.9807 59.4434 71.108 58.8107 71.108C58.1869 71.108 57.6333 70.9848 57.15 70.7385C56.6667 70.4839 56.2889 70.1226 56.0165 69.6545C55.7441 69.1864 55.6079 68.628 55.6079 67.9793C55.6079 67.3059 55.7661 66.7352 56.0824 66.2671C56.3988 65.7908 56.8029 65.4295 57.295 65.1832C57.7959 64.9368 58.3187 64.8136 58.8635 64.8136ZM58.8239 65.06C58.5691 65.06 58.3494 65.1339 58.1649 65.2817C57.9892 65.4213 57.8486 65.6759 57.7431 66.0454C57.6465 66.4067 57.5938 66.92 57.585 67.5851H59.8388C59.9267 66.69 59.8915 66.0454 59.7334 65.6512C59.5752 65.2571 59.272 65.06 58.8239 65.06Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M62.066 70.9233V70.8001L62.4086 70.7262C62.6107 70.6851 62.7733 70.6235 62.8963 70.5414C63.0281 70.4511 63.1511 70.3279 63.2654 70.1719L64.6888 68.2626L62.8963 65.602C62.8084 65.4788 62.7294 65.3844 62.6591 65.3187C62.5888 65.253 62.4789 65.2037 62.3296 65.1708L62.145 65.1216V64.9984H65.4928V65.1216L65.2688 65.1708C64.9612 65.2612 64.8997 65.4418 65.0842 65.7128L66.165 67.2772L67.3381 65.7621C67.4347 65.6225 67.4787 65.5075 67.4699 65.4172C67.4699 65.3187 67.3864 65.2489 67.2194 65.2078L66.8899 65.1216V64.9984H68.8143V65.1216L68.4979 65.1955C68.3046 65.2448 68.1552 65.3104 68.0498 65.3926C67.9444 65.4665 67.8301 65.5855 67.7071 65.7498L66.3232 67.4989L68.1289 70.1226C68.3485 70.4429 68.6429 70.6482 69.012 70.7385L69.2228 70.8001V70.9233H65.5851V70.8001L65.8092 70.7508C65.9585 70.718 66.0508 70.6523 66.0859 70.5537C66.1299 70.447 66.1079 70.3279 66.02 70.1965L64.8602 68.509L63.608 70.2088C63.5026 70.3402 63.4675 70.4552 63.5026 70.5537C63.5465 70.6441 63.6388 70.7056 63.7794 70.7385L64.043 70.8001V70.9233H62.066Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M72.0764 71.108C71.514 71.108 71.0747 70.9766 70.7583 70.7139C70.4508 70.4511 70.297 70.0323 70.297 69.4574V65.2448H69.3876V65.1216L69.7039 65.0723C69.9763 65.0148 70.2092 64.9327 70.4025 64.8259C70.6046 64.7192 70.8023 64.5755 70.9956 64.3948L72.0764 63.2739H72.2082L72.1686 64.9984H73.6448V65.2448H72.1554V69.6792C72.1554 69.9666 72.2213 70.1842 72.3531 70.332C72.4937 70.4798 72.6695 70.5537 72.8804 70.5537C73.0649 70.5537 73.2274 70.5127 73.368 70.4305C73.5086 70.3402 73.6492 70.2211 73.7898 70.0733L73.9216 70.1965C73.7459 70.4757 73.5042 70.6974 73.1967 70.8617C72.8892 71.0259 72.5157 71.108 72.0764 71.108Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M74.3345 70.9233V70.8001L74.5322 70.7508C74.708 70.7015 74.8266 70.6276 74.8881 70.5291C74.9584 70.4305 74.9935 70.3033 74.9935 70.1472V66.2918C74.9935 66.1111 74.9584 65.9797 74.8881 65.8976C74.8266 65.8073 74.708 65.7457 74.5322 65.7128L74.3345 65.6636V65.5404L76.6015 64.8259L76.7333 64.9491L76.8519 66.0085V66.107C76.975 65.8771 77.1331 65.6677 77.3264 65.4788C77.5285 65.2817 77.7482 65.1216 77.9854 64.9984C78.2315 64.8752 78.4731 64.8136 78.7104 64.8136C79.0443 64.8136 79.2991 64.8999 79.4748 65.0723C79.6506 65.2448 79.7384 65.4624 79.7384 65.7251C79.7384 66.0043 79.6506 66.222 79.4748 66.378C79.3079 66.5258 79.1058 66.5997 78.8685 66.5997C78.4995 66.5997 78.1744 66.4273 77.8932 66.0824L77.8668 66.0577C77.779 65.9428 77.6779 65.8812 77.5637 65.873C77.4495 65.8565 77.344 65.9058 77.2474 66.0208C77.1595 66.0947 77.0848 66.185 77.0233 66.2918C76.9706 66.3903 76.9178 66.5053 76.8651 66.6367V70.0733C76.8651 70.4018 77.0189 70.6071 77.3264 70.6892L77.7482 70.8001V70.9233H74.3345Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M81.7935 71.108C81.2839 71.108 80.8533 70.9725 80.5018 70.7015C80.1592 70.4305 79.9878 70.0405 79.9878 69.5313C79.9878 69.1454 80.1987 68.7923 80.6205 68.472C81.0422 68.1435 81.7056 67.8972 82.6107 67.7329C82.7513 67.7083 82.9094 67.6837 83.0852 67.659C83.2609 67.6262 83.4454 67.5933 83.6387 67.5605V66.5874C83.6387 66.029 83.5641 65.6389 83.4147 65.4172C83.2741 65.1873 83.05 65.0723 82.7425 65.0723C82.5316 65.0723 82.3647 65.138 82.2416 65.2694C82.1186 65.3926 82.0396 65.6102 82.0044 65.9222L81.978 66.0577C81.9605 66.4108 81.8682 66.6695 81.7013 66.8337C81.5343 66.998 81.3278 67.0801 81.0818 67.0801C80.8533 67.0801 80.6644 67.0144 80.515 66.883C80.3657 66.7516 80.291 66.5751 80.291 66.3534C80.291 66.0167 80.414 65.7334 80.66 65.5034C80.9148 65.2735 81.2487 65.101 81.6617 64.9861C82.0747 64.8711 82.5228 64.8136 83.0061 64.8136C83.7881 64.8136 84.39 64.9943 84.8118 65.3556C85.2423 65.7087 85.4576 66.2877 85.4576 67.0924V69.8147C85.4576 70.1842 85.6421 70.369 86.0112 70.369H86.3012L86.4198 70.4675C86.2528 70.6646 86.0683 70.8165 85.8662 70.9233C85.6729 71.03 85.3961 71.0834 85.0359 71.0834C84.6492 71.0834 84.3417 71.0013 84.1132 70.837C83.8936 70.6646 83.7486 70.4388 83.6783 70.1596C83.4147 70.4223 83.1423 70.6482 82.8611 70.837C82.5887 71.0177 82.2329 71.108 81.7935 71.108ZM82.5975 70.3566C82.7732 70.3566 82.9358 70.3197 83.0852 70.2458C83.2433 70.1637 83.4279 70.0405 83.6387 69.8762V67.8069C83.5509 67.8233 83.463 67.8397 83.3751 67.8561C83.2873 67.8725 83.1862 67.889 83.072 67.9054C82.6678 68.0039 82.3427 68.1723 82.0967 68.4104C81.8594 68.6404 81.7408 68.9524 81.7408 69.3466C81.7408 69.6833 81.8243 69.9378 81.9912 70.1103C82.1582 70.2745 82.3603 70.3566 82.5975 70.3566Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M89.386 70.9602L87.0531 65.7251C86.93 65.4459 86.7192 65.2612 86.4204 65.1708L86.2359 65.1216V64.9984H89.6496V65.1216L89.4123 65.1708C89.0696 65.253 88.9642 65.4665 89.096 65.8114L90.4799 69.248L91.7716 65.836C91.8419 65.6718 91.8595 65.5363 91.8243 65.4295C91.7892 65.3228 91.6837 65.2448 91.508 65.1955L91.1785 65.1216V64.9984H93.0896V65.1216L92.7074 65.2078C92.5404 65.2489 92.4086 65.3104 92.312 65.3926C92.2241 65.4747 92.1494 65.5979 92.0879 65.7621L90.1504 70.9602H89.386Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M96.3834 64.8136C96.9546 64.8136 97.4423 64.9245 97.8465 65.1462C98.2506 65.3597 98.5582 65.6553 98.7691 66.0331C98.9887 66.4026 99.0986 66.8255 99.0986 67.3018C99.0986 67.3922 99.0942 67.4866 99.0854 67.5851C99.0766 67.6755 99.059 67.7576 99.0327 67.8315H95.105C95.1138 68.7184 95.2807 69.3589 95.6058 69.7531C95.9397 70.139 96.4318 70.332 97.082 70.332C97.5213 70.332 97.8772 70.2663 98.1496 70.1349C98.422 70.0035 98.6768 69.8105 98.9141 69.556L99.0459 69.6668C98.7735 70.1185 98.4088 70.4716 97.9519 70.7262C97.5038 70.9807 96.9634 71.108 96.3307 71.108C95.7069 71.108 95.1533 70.9848 94.67 70.7385C94.1867 70.4839 93.8089 70.1226 93.5365 69.6545C93.2641 69.1864 93.1279 68.628 93.1279 67.9793C93.1279 67.3059 93.2861 66.7352 93.6024 66.2671C93.9187 65.7908 94.3229 65.4295 94.815 65.1832C95.3158 64.9368 95.8387 64.8136 96.3834 64.8136ZM96.3439 65.06C96.0891 65.06 95.8694 65.1339 95.6849 65.2817C95.5092 65.4213 95.3686 65.6759 95.2631 66.0454C95.1665 66.4067 95.1138 66.92 95.105 67.5851H97.3588C97.4466 66.69 97.4115 66.0454 97.2533 65.6512C97.0952 65.2571 96.792 65.06 96.3439 65.06Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M99.7554 70.9233V70.8001L99.9531 70.7508C100.129 70.7015 100.247 70.6276 100.309 70.5291C100.379 70.4305 100.414 70.3033 100.414 70.1472V66.2918C100.414 66.1111 100.379 65.9797 100.309 65.8976C100.247 65.8073 100.129 65.7457 99.9531 65.7128L99.7554 65.6636V65.5404L102.022 64.8259L102.154 64.9491L102.273 66.0085V66.107C102.396 65.8771 102.554 65.6677 102.747 65.4788C102.949 65.2817 103.169 65.1216 103.406 64.9984C103.652 64.8752 103.894 64.8136 104.131 64.8136C104.465 64.8136 104.72 64.8999 104.896 65.0723C105.071 65.2448 105.159 65.4624 105.159 65.7251C105.159 66.0043 105.071 66.222 104.896 66.378C104.729 66.5258 104.527 66.5997 104.289 66.5997C103.92 66.5997 103.595 66.4273 103.314 66.0824L103.288 66.0577C103.2 65.9428 103.099 65.8812 102.985 65.873C102.87 65.8565 102.765 65.9058 102.668 66.0208C102.58 66.0947 102.506 66.185 102.444 66.2918C102.391 66.3903 102.339 66.5053 102.286 66.6367V70.0733C102.286 70.4018 102.44 70.6071 102.747 70.6892L103.169 70.8001V70.9233H99.7554Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M108.241 68.7923C107.634 68.7923 107.12 68.6978 106.699 68.509V68.9278C106.699 69.1823 106.835 69.3343 107.107 69.3835L109.585 69.8147C109.998 69.8886 110.371 69.9871 110.705 70.1103C111.039 70.2252 111.307 70.3936 111.509 70.6153C111.711 70.8288 111.812 71.1244 111.812 71.5022C111.812 71.9046 111.672 72.2741 111.391 72.6108C111.11 72.9557 110.692 73.2308 110.139 73.4361C109.594 73.6496 108.913 73.7563 108.096 73.7563C107.393 73.7563 106.835 73.6865 106.422 73.5469C106.009 73.4156 105.714 73.2431 105.539 73.0296C105.372 72.8161 105.288 72.5903 105.288 72.3521C105.288 72.0565 105.394 71.7568 105.605 71.4529C105.824 71.1573 106.092 70.9192 106.409 70.7385C106.136 70.6399 105.938 70.5127 105.815 70.3566C105.692 70.2006 105.631 70.0323 105.631 69.8516C105.631 69.6874 105.675 69.5355 105.763 69.3958C105.859 69.248 105.974 69.1002 106.105 68.9524L106.54 68.4351C105.899 68.0902 105.578 67.5482 105.578 66.8091C105.578 66.2179 105.802 65.7375 106.25 65.3679C106.707 64.9984 107.375 64.8136 108.254 64.8136C108.702 64.8136 109.093 64.8629 109.427 64.9614C109.77 65.06 110.051 65.1996 110.27 65.3802C110.552 65.3392 110.815 65.2735 111.061 65.1832C111.316 65.0846 111.544 64.9532 111.747 64.789L111.931 64.9122V65.5404H110.442C110.758 65.8689 110.916 66.2918 110.916 66.8091C110.916 67.3839 110.688 67.8602 110.231 68.238C109.783 68.6075 109.119 68.7923 108.241 68.7923ZM108.227 68.5459C108.579 68.5459 108.834 68.4104 108.992 68.1394C109.159 67.8684 109.242 67.4168 109.242 66.7845C109.242 66.1522 109.159 65.7087 108.992 65.4542C108.834 65.1914 108.588 65.06 108.254 65.06C107.929 65.06 107.683 65.1955 107.516 65.4665C107.349 65.7293 107.265 66.1768 107.265 66.8091C107.265 67.4414 107.34 67.889 107.489 68.1518C107.648 68.4145 107.894 68.5459 108.227 68.5459ZM106.264 71.958C106.264 72.4425 106.422 72.8079 106.738 73.0542C107.063 73.3006 107.573 73.4238 108.267 73.4238C108.996 73.4238 109.545 73.3129 109.915 73.0912C110.284 72.8695 110.468 72.5574 110.468 72.155C110.468 71.9251 110.376 71.7403 110.191 71.6007C110.016 71.4611 109.712 71.3544 109.282 71.2805L106.896 70.8617C106.826 70.8452 106.756 70.8288 106.685 70.8124C106.562 70.9766 106.461 71.1614 106.382 71.3667C106.303 71.5802 106.264 71.7773 106.264 71.958Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M113.951 64.1731C113.652 64.1731 113.397 64.0869 113.187 63.9144C112.984 63.7338 112.883 63.5079 112.883 63.2369C112.883 62.9577 112.984 62.7319 113.187 62.5595C113.397 62.387 113.652 62.3008 113.951 62.3008C114.25 62.3008 114.5 62.387 114.702 62.5595C114.904 62.7319 115.005 62.9577 115.005 63.2369C115.005 63.5079 114.904 63.7338 114.702 63.9144C114.5 64.0869 114.25 64.1731 113.951 64.1731ZM112.396 70.9233V70.8001L112.58 70.7508C112.756 70.7015 112.875 70.6276 112.936 70.5291C113.006 70.4305 113.042 70.2992 113.042 70.1349V66.2794C113.042 66.107 113.006 65.9797 112.936 65.8976C112.875 65.8073 112.756 65.7457 112.58 65.7128L112.396 65.6759V65.5527L114.808 64.8259L114.939 64.9491L114.9 66.6983V70.1472C114.9 70.3115 114.931 70.4429 114.992 70.5414C115.063 70.6399 115.181 70.7139 115.348 70.7631L115.48 70.8001V70.9233H112.396Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M116.063 70.9233V70.8001L116.248 70.7508C116.555 70.6687 116.709 70.4675 116.709 70.1472V66.2918C116.709 66.1111 116.679 65.9797 116.617 65.8976C116.555 65.8073 116.437 65.7457 116.261 65.7128L116.063 65.6636V65.5404L118.317 64.8259L118.449 64.9491L118.555 65.6882C118.862 65.4336 119.209 65.2242 119.596 65.06C119.982 64.8957 120.365 64.8136 120.742 64.8136C121.322 64.8136 121.766 64.9614 122.074 65.2571C122.39 65.5527 122.548 66.0043 122.548 66.612V70.1596C122.548 70.4798 122.715 70.681 123.049 70.7631L123.168 70.8001V70.9233H120.057V70.8001L120.228 70.7508C120.536 70.6605 120.69 70.4593 120.69 70.1472V66.2179C120.69 65.6923 120.409 65.4295 119.846 65.4295C119.46 65.4295 119.038 65.6102 118.581 65.9715V70.1596C118.581 70.4798 118.735 70.681 119.042 70.7631L119.161 70.8001V70.9233H116.063Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M126.992 64.8136C127.563 64.8136 128.05 64.9245 128.455 65.1462C128.859 65.3597 129.166 65.6553 129.377 66.0331C129.597 66.4026 129.707 66.8255 129.707 67.3018C129.707 67.3922 129.702 67.4866 129.693 67.5851C129.685 67.6755 129.667 67.7576 129.641 67.8315H125.713C125.722 68.7184 125.889 69.3589 126.214 69.7531C126.548 70.139 127.04 70.332 127.69 70.332C128.129 70.332 128.485 70.2663 128.758 70.1349C129.03 70.0035 129.285 69.8105 129.522 69.556L129.654 69.6668C129.382 70.1185 129.017 70.4716 128.56 70.7262C128.112 70.9807 127.571 71.108 126.939 71.108C126.315 71.108 125.761 70.9848 125.278 70.7385C124.795 70.4839 124.417 70.1226 124.145 69.6545C123.872 69.1864 123.736 68.628 123.736 67.9793C123.736 67.3059 123.894 66.7352 124.21 66.2671C124.527 65.7908 124.931 65.4295 125.423 65.1832C125.924 64.9368 126.447 64.8136 126.992 64.8136ZM126.952 65.06C126.697 65.06 126.477 65.1339 126.293 65.2817C126.117 65.4213 125.977 65.6759 125.871 66.0454C125.775 66.4067 125.722 66.92 125.713 67.5851H127.967C128.055 66.69 128.02 66.0454 127.861 65.6512C127.703 65.2571 127.4 65.06 126.952 65.06Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M136.028 71.108C135.51 71.108 135.044 71.0013 134.631 70.7878C134.218 70.566 133.888 70.2294 133.642 69.7777C133.405 69.3178 133.287 68.7307 133.287 68.0163C133.287 67.2936 133.423 66.6983 133.695 66.2302C133.968 65.7539 134.328 65.4008 134.776 65.1708C135.224 64.9327 135.712 64.8136 136.239 64.8136C136.546 64.8136 136.841 64.8424 137.122 64.8999C137.403 64.9573 137.654 65.0436 137.873 65.1585V63.5572C137.873 63.3848 137.842 63.2575 137.781 63.1754C137.728 63.0932 137.61 63.0358 137.425 63.0029L137.175 62.9536V62.8305L139.574 62.2885L139.718 62.3993L139.666 64.1238V70.1472C139.666 70.3115 139.697 70.447 139.758 70.5537C139.82 70.6523 139.934 70.7221 140.101 70.7631L140.219 70.8001V70.9233L137.966 71.0588L137.847 70.6153C137.61 70.7631 137.337 70.8822 137.03 70.9725C136.731 71.0629 136.397 71.108 136.028 71.108ZM136.792 70.6523C137.162 70.6523 137.5 70.5496 137.807 70.3443V65.4542C137.482 65.2571 137.148 65.1585 136.806 65.1585C136.384 65.1585 136.024 65.3885 135.725 65.8483C135.426 66.3 135.277 67.0144 135.277 67.9916C135.277 68.9688 135.417 69.6586 135.699 70.061C135.98 70.4552 136.344 70.6523 136.792 70.6523Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M141.678 61.9189C142.003 61.9189 142.263 62.0298 142.456 62.2515C142.658 62.465 142.759 62.7483 142.759 63.1015C142.759 63.5613 142.614 63.9924 142.324 64.3948C142.034 64.789 141.674 65.0846 141.243 65.2817L141.164 65.1339C141.349 65.0025 141.511 64.8342 141.652 64.6289C141.792 64.4236 141.894 64.169 141.955 63.8652L141.678 63.8036C141.371 63.7379 141.129 63.6188 140.953 63.4464C140.786 63.2657 140.703 63.0522 140.703 62.8058C140.703 62.543 140.795 62.3295 140.98 62.1653C141.173 62.0011 141.406 61.9189 141.678 61.9189Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M145.746 71.108C145.078 71.108 144.498 70.9807 144.006 70.7262C143.514 70.4634 143.132 70.0939 142.859 69.6176C142.596 69.1413 142.464 68.5829 142.464 67.9423C142.464 67.3018 142.604 66.7475 142.886 66.2794C143.176 65.8114 143.567 65.45 144.059 65.1955C144.559 64.9409 145.122 64.8136 145.746 64.8136C146.37 64.8136 146.928 64.9409 147.42 65.1955C147.912 65.4418 148.298 65.7991 148.579 66.2671C148.869 66.7352 149.014 67.2936 149.014 67.9423C149.014 68.5911 148.878 69.1536 148.606 69.6299C148.342 70.098 147.964 70.4634 147.472 70.7262C146.989 70.9807 146.413 71.108 145.746 71.108ZM145.746 70.8617C146.053 70.8617 146.299 70.7795 146.484 70.6153C146.668 70.4511 146.8 70.1596 146.879 69.7407C146.967 69.3219 147.011 68.7307 147.011 67.967C147.011 67.1951 146.967 66.5997 146.879 66.1809C146.8 65.7621 146.668 65.4706 146.484 65.3063C146.299 65.1421 146.053 65.06 145.746 65.06C145.438 65.06 145.188 65.1421 144.994 65.3063C144.81 65.4706 144.674 65.7621 144.586 66.1809C144.507 66.5997 144.467 67.1951 144.467 67.967C144.467 68.7307 144.507 69.3219 144.586 69.7407C144.674 70.1596 144.81 70.4511 144.994 70.6153C145.188 70.7795 145.438 70.8617 145.746 70.8617Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M149.581 70.9233V70.8001L149.74 70.7508C150.056 70.6523 150.214 70.447 150.214 70.1349V63.5449C150.214 63.3807 150.179 63.2575 150.109 63.1754C150.038 63.085 149.915 63.0193 149.74 62.9783L149.568 62.9413V62.8181L151.98 62.2885L152.138 62.3993L152.086 64.1238V68.3365C152.086 68.6404 152.086 68.9442 152.086 69.248C152.094 69.5437 152.099 69.8393 152.099 70.1349C152.099 70.2992 152.134 70.4346 152.204 70.5414C152.275 70.6399 152.393 70.7139 152.56 70.7631L152.731 70.8001V70.9233H149.581Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M154.895 64.1731C154.596 64.1731 154.341 64.0869 154.13 63.9144C153.928 63.7338 153.827 63.5079 153.827 63.2369C153.827 62.9577 153.928 62.7319 154.13 62.5595C154.341 62.387 154.596 62.3008 154.895 62.3008C155.193 62.3008 155.444 62.387 155.646 62.5595C155.848 62.7319 155.949 62.9577 155.949 63.2369C155.949 63.5079 155.848 63.7338 155.646 63.9144C155.444 64.0869 155.193 64.1731 154.895 64.1731ZM153.339 70.9233V70.8001L153.524 70.7508C153.7 70.7015 153.818 70.6276 153.88 70.5291C153.95 70.4305 153.985 70.2992 153.985 70.1349V66.2794C153.985 66.107 153.95 65.9797 153.88 65.8976C153.818 65.8073 153.7 65.7457 153.524 65.7128L153.339 65.6759V65.5527L155.751 64.8259L155.883 64.9491L155.844 66.6983V70.1472C155.844 70.3115 155.874 70.4429 155.936 70.5414C156.006 70.6399 156.125 70.7139 156.292 70.7631L156.424 70.8001V70.9233H153.339Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M159.844 70.9602L157.511 65.7251C157.388 65.4459 157.177 65.2612 156.878 65.1708L156.694 65.1216V64.9984H160.107V65.1216L159.87 65.1708C159.527 65.253 159.422 65.4665 159.554 65.8114L160.938 69.248L162.229 65.836C162.3 65.6718 162.317 65.5363 162.282 65.4295C162.247 65.3228 162.141 65.2448 161.966 65.1955L161.636 65.1216V64.9984L163.547 64.9984V65.1216L163.165 65.2078C162.998 65.2489 162.866 65.3104 162.77 65.3926C162.682 65.4747 162.607 65.5979 162.546 65.7621L160.608 70.9602H159.844Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M165.496 71.108C164.986 71.108 164.556 70.9725 164.204 70.7015C163.862 70.4305 163.69 70.0405 163.69 69.5313C163.69 69.1454 163.901 68.7923 164.323 68.472C164.745 68.1435 165.408 67.8972 166.313 67.7329C166.454 67.7083 166.612 67.6837 166.788 67.659C166.963 67.6262 167.148 67.5933 167.341 67.5605V66.5874C167.341 66.029 167.266 65.6389 167.117 65.4172C166.976 65.1873 166.752 65.0723 166.445 65.0723C166.234 65.0723 166.067 65.138 165.944 65.2694C165.821 65.3926 165.742 65.6102 165.707 65.9222L165.68 66.0577C165.663 66.4108 165.571 66.6695 165.404 66.8337C165.237 66.998 165.03 67.0801 164.784 67.0801C164.556 67.0801 164.367 67.0144 164.217 66.883C164.068 66.7516 163.993 66.5751 163.993 66.3534C163.993 66.0167 164.116 65.7334 164.362 65.5034C164.617 65.2735 164.951 65.101 165.364 64.9861C165.777 64.8711 166.225 64.8136 166.708 64.8136C167.491 64.8136 168.092 64.9943 168.514 65.3556C168.945 65.7087 169.16 66.2877 169.16 67.0924V69.8147C169.16 70.1842 169.345 70.369 169.714 70.369H170.004L170.122 70.4675C169.955 70.6646 169.771 70.8165 169.569 70.9233C169.375 71.03 169.099 71.0834 168.738 71.0834C168.352 71.0834 168.044 71.0013 167.816 70.837C167.596 70.6646 167.451 70.4388 167.381 70.1596C167.117 70.4223 166.845 70.6482 166.564 70.837C166.291 71.0177 165.935 71.108 165.496 71.108ZM166.3 70.3566C166.476 70.3566 166.638 70.3197 166.788 70.2458C166.946 70.1637 167.13 70.0405 167.341 69.8762V67.8069C167.253 67.8233 167.165 67.8397 167.078 67.8561C166.99 67.8725 166.889 67.889 166.774 67.9054C166.37 68.0039 166.045 68.1723 165.799 68.4104C165.562 68.6404 165.443 68.9524 165.443 69.3466C165.443 69.6833 165.527 69.9378 165.694 70.1103C165.861 70.2745 166.063 70.3566 166.3 70.3566Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M175.518 71.0834L173.29 70.9233V70.8001L173.422 70.7754C173.765 70.7015 173.936 70.4962 173.936 70.1596V63.5695C173.936 63.3971 173.905 63.2657 173.844 63.1754C173.791 63.085 173.677 63.0234 173.501 62.9906L173.316 62.9413V62.8181L175.663 62.2885L175.821 62.3993L175.768 64.1361V65.3802C176.058 65.1914 176.374 65.0518 176.717 64.9614C177.06 64.8629 177.407 64.8136 177.758 64.8136C178.259 64.8136 178.703 64.9245 179.089 65.1462C179.476 65.3597 179.779 65.6964 179.999 66.1563C180.227 66.6079 180.341 67.191 180.341 67.9054C180.341 68.6198 180.214 69.2152 179.959 69.6915C179.713 70.1596 179.379 70.5127 178.958 70.7508C178.545 70.989 178.088 71.108 177.587 71.108C177.262 71.108 176.932 71.067 176.598 70.9848C176.273 70.9027 175.983 70.7878 175.728 70.6399L175.518 71.0834ZM176.928 70.6892C177.209 70.6892 177.455 70.6071 177.666 70.4429C177.877 70.2786 178.044 69.9994 178.167 69.6053C178.29 69.2029 178.351 68.6527 178.351 67.9547C178.351 67.2567 178.294 66.7188 178.18 66.341C178.066 65.9633 177.903 65.7005 177.692 65.5527C177.49 65.4049 177.244 65.331 176.954 65.331C176.541 65.331 176.159 65.4377 175.807 65.6512V70.3813C175.974 70.4798 176.146 70.5578 176.322 70.6153C176.497 70.6646 176.699 70.6892 176.928 70.6892Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M182.504 64.1731C182.205 64.1731 181.95 64.0869 181.739 63.9144C181.537 63.7338 181.436 63.5079 181.436 63.2369C181.436 62.9577 181.537 62.7319 181.739 62.5595C181.95 62.387 182.205 62.3008 182.504 62.3008C182.803 62.3008 183.053 62.387 183.255 62.5595C183.457 62.7319 183.558 62.9577 183.558 63.2369C183.558 63.5079 183.457 63.7338 183.255 63.9144C183.053 64.0869 182.803 64.1731 182.504 64.1731ZM180.949 70.9233V70.8001L181.133 70.7508C181.309 70.7015 181.427 70.6276 181.489 70.5291C181.559 70.4305 181.594 70.2992 181.594 70.1349V66.2794C181.594 66.107 181.559 65.9797 181.489 65.8976C181.427 65.8073 181.309 65.7457 181.133 65.7128L180.949 65.6759V65.5527L183.361 64.8259L183.492 64.9491L183.453 66.6983V70.1472C183.453 70.3115 183.484 70.4429 183.545 70.5414C183.615 70.6399 183.734 70.7139 183.901 70.7631L184.033 70.8001V70.9233H180.949Z" fill="#383920" fill-opacity="0.5"/>
+<path d="M187.951 71.108C187.283 71.108 186.703 70.9807 186.211 70.7262C185.719 70.4634 185.337 70.0939 185.064 69.6176C184.801 69.1413 184.669 68.5829 184.669 67.9423C184.669 67.3018 184.81 66.7475 185.091 66.2794C185.381 65.8114 185.772 65.45 186.264 65.1955C186.765 64.9409 187.327 64.8136 187.951 64.8136C188.575 64.8136 189.133 64.9409 189.625 65.1955C190.117 65.4418 190.503 65.7991 190.785 66.2671C191.075 66.7352 191.22 67.2936 191.22 67.9423C191.22 68.5911 191.083 69.1536 190.811 69.6299C190.547 70.098 190.17 70.4634 189.677 70.7262C189.194 70.9807 188.619 71.108 187.951 71.108ZM187.951 70.8617C188.258 70.8617 188.504 70.7795 188.689 70.6153C188.873 70.4511 189.005 70.1596 189.084 69.7407C189.172 69.3219 189.216 68.7307 189.216 67.967C189.216 67.1951 189.172 66.5997 189.084 66.1809C189.005 65.7621 188.873 65.4706 188.689 65.3063C188.504 65.1421 188.258 65.06 187.951 65.06C187.643 65.06 187.393 65.1421 187.2 65.3063C187.015 65.4706 186.879 65.7621 186.791 66.1809C186.712 66.5997 186.672 67.1951 186.672 67.967C186.672 68.7307 186.712 69.3219 186.791 69.7407C186.879 70.1596 187.015 70.4511 187.2 70.6153C187.393 70.7795 187.643 70.8617 187.951 70.8617Z" fill="#383920" fill-opacity="0.5"/>
+</svg>
diff --git a/pages/index.ejs b/pages/index.ejs
index 1dff8f3..3dd1548 100644
--- a/pages/index.ejs
+++ b/pages/index.ejs
@@ -66,5 +66,15 @@
       <img src="/images/logoHeader.png" class="spinner">
     </div>
 
+    <div class="notification"></div>
+
+    <?php
+      if($getQ[0] == 'checkout' || $getQ[0] == 'account') {
+    ?>
+      <script src="https://www.google.com/recaptcha/api.js?render=${ENV.RECAPTCHA_SITE_KEY}"></script>
+    <?php
+      }
+    ?>
+
   </body>
 </html>
diff --git a/src/js/index.js b/src/js/index.js
index d814ace..250c3a1 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -34,6 +34,17 @@ window.Spinner = (action = 'show') => {
   }
 }
 
+window.Apis.updateCartQty = (pid, price, qty) => {
+  return new Promise((resolve, reject) => {
+    $.post(apiUrl + `/cart_qty_update.php?buster=${new Date().getTime()}&sid=${sessionStorage.getItem('sid')}`,
+           {pid: pid, price: price, qty: qty}).done( (data) => {
+      resolve(data)
+    }).fail((error, status) => {
+      reject(error)
+    })
+  })
+}
+
 window.Apis.addToCart = (pid, price, qty) => {
   return new Promise((resolve, reject) => {
     $.post(apiUrl + `/cart_add.php?buster=${new Date().getTime()}&sid=${sessionStorage.getItem('sid')}`,
@@ -169,3 +180,14 @@ window.Apis.saveOrder = (profile, cart, token, uid, total, paid = false) => {
     })
   })
 }
+
+
+window.Apis.notification = (text) => {
+  const notification = $('.notification')
+  notification.html(text).fadeIn(10, () => {
+    setTimeout(() => {
+      notification.fadeOut(300)
+    },5000)
+  })
+}
+
diff --git a/src/scss/global.scss b/src/scss/global.scss
index 8094303..105efc8 100644
--- a/src/scss/global.scss
+++ b/src/scss/global.scss
@@ -27,6 +27,21 @@ body {
       animation: spinner 2s linear infinite;
     }
   }
+
+  .notification {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    padding: 10px 20px;
+    @include font-style($font-sans, 'regular-italic', $font-16);
+    color: $white;
+    text-align: center;
+    background: $olive-dark;
+    animation: blink 3s linear;
+    z-index: 200;
+  }
 }
 
 
@@ -164,6 +179,14 @@ button {
   100% {opacity: 1;}
 }
 
+@keyframes blink {
+  0% { opacity: 1; }
+  25% { opacity: .7; }
+  50% { opacity: 1; }
+  75% { opacity: .7; }
+  100% { opacity: 1; }
+}
+
 .debug-border {
   border: 1px solid red;
 }