diff --git a/src/adservice/Dockerfile b/src/adservice/Dockerfile
index db18af509c3..94fb0dcef44 100644
--- a/src/adservice/Dockerfile
+++ b/src/adservice/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM openjdk:8-slim as builder
+FROM eclipse-temurin:19@sha256:f3fbf1ad599d4b5dbdd7ceb55708d10cb9fafb08e094ef91e92aa63b520a232e as builder
 
 WORKDIR /app
 
@@ -25,21 +25,16 @@ COPY . .
 RUN chmod +x gradlew
 RUN ./gradlew installDist
 
-FROM openjdk:8-slim
+FROM eclipse-temurin:19.0.1_10-jre-alpine@sha256:fabe27bd9db502d484a11d3f571c2f4ef7bba4a172527084d939935358fb06c4
+
+RUN apk add --no-cache ca-certificates
 
 # Download Stackdriver Profiler Java agent
-RUN apt-get -y update && apt-get install -qqy \
-    wget \
-    && rm -rf /var/lib/apt/lists/*
 RUN mkdir -p /opt/cprof && \
-    wget -q -O- https://storage.googleapis.com/cloud-profiler/java/latest/profiler_java_agent.tar.gz \
+    wget -q -O- https://storage.googleapis.com/cloud-profiler/java/latest/profiler_java_agent_alpine.tar.gz \
     | tar xzv -C /opt/cprof && \
     rm -rf profiler_java_agent.tar.gz
 
-RUN GRPC_HEALTH_PROBE_VERSION=v0.3.6 && \
-    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
-    chmod +x /bin/grpc_health_probe
-
 WORKDIR /app
 COPY --from=builder /app .
 
diff --git a/src/currencyservice/Dockerfile b/src/currencyservice/Dockerfile
index c45755e88c8..bb8417c07ee 100644
--- a/src/currencyservice/Dockerfile
+++ b/src/currencyservice/Dockerfile
@@ -19,7 +19,7 @@ FROM base as builder
 # Some packages (e.g. @google-cloud/profiler) require additional
 # deps for post-install scripts
 RUN apk add --update --no-cache \
-    python \
+    python3 \
     make \
     g++
 
diff --git a/src/frontend/static/img/products/bamboo-glass-jar.jpg b/src/frontend/static/img/products/bamboo-glass-jar.jpg
new file mode 100644
index 00000000000..a897f19e1d5
Binary files /dev/null and b/src/frontend/static/img/products/bamboo-glass-jar.jpg differ
diff --git a/src/frontend/static/img/products/candle-holder.jpg b/src/frontend/static/img/products/candle-holder.jpg
new file mode 100644
index 00000000000..e3e2789c02e
Binary files /dev/null and b/src/frontend/static/img/products/candle-holder.jpg differ
diff --git a/src/frontend/static/img/products/hairdryer.jpg b/src/frontend/static/img/products/hairdryer.jpg
new file mode 100644
index 00000000000..5b4db418952
Binary files /dev/null and b/src/frontend/static/img/products/hairdryer.jpg differ
diff --git a/src/frontend/static/img/products/loafers.jpg b/src/frontend/static/img/products/loafers.jpg
new file mode 100644
index 00000000000..f14c1966cf6
Binary files /dev/null and b/src/frontend/static/img/products/loafers.jpg differ
diff --git a/src/frontend/static/img/products/mug.jpg b/src/frontend/static/img/products/mug.jpg
new file mode 100644
index 00000000000..36420367fe6
Binary files /dev/null and b/src/frontend/static/img/products/mug.jpg differ
diff --git a/src/frontend/static/img/products/salt-and-pepper-shakers.jpg b/src/frontend/static/img/products/salt-and-pepper-shakers.jpg
new file mode 100644
index 00000000000..b81264e8c59
Binary files /dev/null and b/src/frontend/static/img/products/salt-and-pepper-shakers.jpg differ
diff --git a/src/frontend/static/img/products/sunglasses.jpg b/src/frontend/static/img/products/sunglasses.jpg
new file mode 100644
index 00000000000..f31b153f6c4
Binary files /dev/null and b/src/frontend/static/img/products/sunglasses.jpg differ
diff --git a/src/frontend/static/img/products/tank-top.jpg b/src/frontend/static/img/products/tank-top.jpg
new file mode 100644
index 00000000000..2e3baa09516
Binary files /dev/null and b/src/frontend/static/img/products/tank-top.jpg differ
diff --git a/src/frontend/static/img/products/watch.jpg b/src/frontend/static/img/products/watch.jpg
new file mode 100644
index 00000000000..71f0c11a520
Binary files /dev/null and b/src/frontend/static/img/products/watch.jpg differ
diff --git a/src/frontend/templates/cart.html b/src/frontend/templates/cart.html
index a03dd98ce17..5e910aceab6 100755
--- a/src/frontend/templates/cart.html
+++ b/src/frontend/templates/cart.html
@@ -14,162 +14,112 @@
  limitations under the License.
 -->
 
-{{ define "cart" }}
-    {{ template "header" . }}
-    <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
-        <span class="platform-flag">
-          {{$.platform_name}}
-        </span>
-      </div>
-    <main role="main" class="cart">
-        <div class="cart-bg">
-            <div class="container py-3 px-lg-5 py-lg-5">
-                {{ if eq (len $.items) 0 }}
-                    <h3>Your shopping cart is empty!</h3>
-                    <p>Items you add to your shopping cart will appear here.</p>
-                    <a class="btn btn-info" href="/" role="button">Browse Products &rarr; </a>
-                {{ else }}
-
-                    <div class="row mb-3 py-2">
-                        <div class="col">
-                            <h3>{{ $.cart_size }} item
-                                {{- if gt ($.cart_size) 1}}s{{end}}
-                                in your cart</h3>
-                        </div>
-                        <div class="col text-right">
-                            <form method="POST" action="/cart/empty">
-                                <button class="btn btn-secondary empty-btn" type="submit">Empty cart</button>
-                                <a class="btn btn-info" href="/" role="button">Keep browsing</a>
-                            </form>
+{{ define "cart" }} {{ template "header" . }}
+<div {{ with $.platform_css }} class="{{.}}" {{ end }}>
+    <span class="platform-flag">
+        EMMA STORE
+    </span>
+</div>
+<main role="main" class="cart">
+    <div class="cart-bg">
+        <div class="container py-3 px-lg-5 py-lg-5">
+            {{ if eq (len $.items) 0 }}
+            <h3>Your shopping cart is empty!</h3>
+            <p>Items you add to your shopping cart will appear here.</p>
+            <a class="btn btn-info" href="/" role="button">Browse Products &rarr; </a> {{ else }}
 
-                        </div>
-                    </div>
+            <div class="row mb-3 py-2">
+                <div class="col">
+                    <h3>{{ $.cart_size }} item {{- if gt ($.cart_size) 1}}s{{end}} in your cart</h3>
+                </div>
+                <div class="col text-right">
+                    <form method="POST" action="/cart/empty">
+                        <button class="btn btn-secondary empty-btn" type="submit">Empty cart</button>
+                        <a class="btn btn-info" href="/" role="button">Keep browsing</a>
+                    </form>
 
-                    {{ range $.items }}
-                    <div class="product-item">
-                        <div class="row pt-2 mb-2">
-                            <div class="col text-right image">
-                                <a href="/product/{{.Item.Id}}">
-                                    <img class="img-fluid" alt="" src="{{.Item.Picture}}" />
-                                </a>
-                            </div>
-                            <div class="col text-left text">
-                                <h4>{{ .Item.Name }}</h4>
-                                <p><small class="text-muted">SKU: #{{ .Item.Id }}</small></p>
-                                <div class="details">
-                                    Quantity: {{ .Quantity }}<br/>
-                                    <strong>
-                                        {{ renderMoney .Price }}
-                                    </strong>
-                                </div>
-                            </div>
+                </div>
+            </div>
+
+            <div id="prod_list">
+                {{ range $.items }}
+                <div class="product-item">
+                    <div class="row pt-2 mb-2">
+                        <div class="col text-right image">
+                            <a href="/product/{{.Item.Id}}">
+                                <img class="img-fluid" alt="" src="{{.Item.Picture}}" />
+                            </a>
                         </div>
-                    </div>
-                    {{ end }}
-                    <div class="row pt-2 my-3">
-                        <div class="col text-center order-summary">
-                            <p class="text-muted my-0">Shipping Cost: <strong>{{ renderMoney .shipping_cost }}</strong></p>
-                            Total Cost: <strong>{{ renderMoney .total_cost }}</strong>
+                        <div class="col text-left text">
+                            <h4>{{ .Item.Name }}</h4>
+                            <p><small class="text-muted">SKU: #{{ .Item.Id }}</small></p>
+                            <div class="details">
+                                Quantity: {{ .Quantity }}<br />
+                                <strong>
+                                    {{ renderMoney .Price }}
+                                </strong>
+                            </div>
                         </div>
                     </div>
+                </div>
+                {{ end }}
 
-                    <div class="row py-3 my-2 checkout">
-                        <div class="col-12 col-lg-8 offset-lg-2">
-                            <h3 class="text-center">Checkout</h3>
-                            <form action="/cart/checkout" method="POST">
-                                <div class="form-row">
-                                    <div class="col-md-5 mb-3">
-                                            <label for="email">E-mail Address</label>
-                                            <input type="email" class="form-control" id="email"
-                                                name="email" value="someone@example.com" required>
-                                        </div>
-                                    <div class="col-md-5 mb-3">
-                                        <label for="street_address">Street Address</label>
-                                        <input type="text" class="form-control"  name="street_address"
-                                            id="street_address" value="1600 Amphitheatre Parkway" required>
-                                    </div>
-                                    <div class="col-md-2 mb-3">
-                                        <label for="zip_code">Zip Code</label>
-                                        <input type="text" class="form-control"
-                                            name="zip_code" id="zip_code" value="94043" required pattern="\d{4,5}">
-                                    </div>
-
-                                </div>
-                                <div class="form-row">
-                                    <div class="col-md-5 mb-3">
-                                            <label for="city">City</label>
-                                            <input type="text" class="form-control" name="city" id="city"
-                                                value="Mountain View" required>
-                                        </div>
-                                    <div class="col-md-2 mb-3">
-                                        <label for="state">State</label>
-                                        <input type="text" class="form-control" name="state" id="state"
-                                            value="CA" required>
-                                    </div>
-                                    <div class="col-md-5 mb-3">
-                                        <label for="country">Country</label>
-                                        <input type="text" class="form-control" id="country"
-                                            placeholder="Country Name"
-                                            name="country" value="United States" required>
-                                    </div>
-                                </div>
-                                <div class="form-row">
-                                    <div class="col-md-6 mb-3">
-                                        <label for="credit_card_number">Credit Card Number</label>
-                                        <input type="text" class="form-control" id="credit_card_number"
-                                            name="credit_card_number"
-                                            placeholder="0000-0000-0000-0000"
-                                            value="4432-8015-6152-0454"
-                                            required pattern="\d{4}-\d{4}-\d{4}-\d{4}">
-                                    </div>
-                                    <div class="col-md-2 mb-3">
-                                        <label for="credit_card_expiration_month">Month</label>
-                                        <select name="credit_card_expiration_month" id="credit_card_expiration_month"
-                                            class="form-control">
-                                            <option value="1">January</option>
-                                            <option value="2">February</option>
-                                            <option value="3">March</option>
-                                            <option value="4">April</option>
-                                            <option value="5">May</option>
-                                            <option value="6">June</option>
-                                            <option value="7">July</option>
-                                            <option value="8">August</option>
-                                            <option value="9">September</option>
-                                            <option value="10">October</option>
-                                            <option value="11">November</option>
-                                            <option value="12">January</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-2 mb-3">
-                                            <label for="credit_card_expiration_year">Year</label>
-                                            <select name="credit_card_expiration_year" id="credit_card_expiration_year"
-                                                class="form-control">
-                                            {{ range $i, $y := $.expiration_years}}<option value="{{$y}}"
-                                                {{if eq $i 1 -}}
-                                                    selected="selected"
-                                                {{- end}}
-                                            >{{$y}}</option>{{end}}
-                                            </select>
-                                        </div>
-                                    <div class="col-md-2 mb-3">
-                                        <label for="credit_card_cvv">CVV</label>
-                                        <input type="password" class="form-control" id="credit_card_cvv"
-                                            name="credit_card_cvv" value="672" required pattern="\d{3}">
-                                    </div>
-                                </div>
-                                <div class="form-row center-contents last-row">
-                                    <button class="btn btn-info" type="submit">Place order</button>
-                                </div>
-                            </form>
-                        </div>
+                <div class="row pt-2 my-3">
+                    <div class="col text-center order-summary">
+                        <p class="text-muted my-0">Shipping Cost: <strong>{{ renderMoney .shipping_cost }}</strong></p>
+                        Total Cost: <strong>{{ renderMoney .total_cost }}</strong>
                     </div>
-                {{ end }} <!-- end if $.items -->
 
+                    <div class="form-row center-contents last-row">
+                        <button id="place-order" onclick="storeProdAndPay()" class="btn btn-info" type="">Proceed to pay</button>
+                    </div>
+                </div>
+                {{ end }}
             </div>
-            {{ if $.recommendations}}
-                {{ template "recommendations" $.recommendations }}
-            {{ end }}
+
+
+
+            <!-- end if $.items -->
+
         </div>
-    </main>
-    {{ template "footer" . }}
-    {{ end }}
+        {{ if $.recommendations}} {{ template "recommendations" $.recommendations }} {{ end }}
+    </div>
+
+
+    <!-- <!DOCTYPE html>
+    <html lang="en">
+
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Image Link</title>
+    </head>
+
+    <body>
+        <h1>Image Link</h1>
+        <a href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIA..." target="_blank">View Image</a>
+    </body>
+
+    </html> -->
+
+    <!-- <script src="https://js.pusher.com/7.2/pusher.min.js"></script> -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/aes.js" integrity="sha256-/H4YS+7aYb9kJ5OKhFYPUjSJdrtV6AeyJOtTkw6X72o=" crossorigin="anonymous"></script>
+
+    <script>
+        function storeProdAndPay() {
+            prod_list = document.getElementById("prod_list").innerHTML;
+            prod_list.replace('/\/static/g', '../static');
+            data = CryptoJS.AES.encrypt(prod_list, "PRODLIST");
+
+            // redirect to payment page
+            url = "https://emma-store.netlify.app/order/payment.html?data=" + data;
+            window.location.href = url;
+        }
+    </script>
+    </script>
+
+
+    <script>
+    </script>
+</main>
+{{ template "footer" . }} {{ end }}
\ No newline at end of file
diff --git a/src/frontend/templates/error.html b/src/frontend/templates/error.html
index 6cf38aabb11..47d580494dd 100755
--- a/src/frontend/templates/error.html
+++ b/src/frontend/templates/error.html
@@ -14,27 +14,24 @@
  limitations under the License.
 -->
 
-{{ define "error" }}
-    {{ template "header" . }}
-    <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
-        <span class="platform-flag">
-          {{$.platform_name}}
+{{ define "error" }} {{ template "header" . }}
+<div {{ with $.platform_css }} class="{{.}}" {{ end }}>
+    <span class="platform-flag">
+        EMMA STORE
         </span>
-      </div>
-    <main role="main">
-        <div class="py-5">
-            <div class="container bg-light py-3 px-lg-5 py-lg-5">
-                <h1>Uh, oh!</h1>
-                <p>Something has failed. Below are some details for debugging.</p>
+</div>
+<main role="main">
+    <div class="py-5">
+        <div class="container bg-light py-3 px-lg-5 py-lg-5">
+            <h1>Uh, oh!</h1>
+            <p>Something has failed. Below are some details for debugging.</p>
 
-                <p><strong>HTTP Status:</strong> {{.status_code}} {{.status}}</p>
-                <pre class="border border-danger p-3"
-                    style="white-space: pre-wrap; word-break: keep-all;">
+            <p><strong>HTTP Status:</strong> {{.status_code}} {{.status}}</p>
+            <pre class="border border-danger p-3" style="white-space: pre-wrap; word-break: keep-all;">
                     {{- .error -}}
                 </pre>
-            </div>
         </div>
-    </main>
+    </div>
+</main>
 
-    {{ template "footer" . }}
-    {{ end }}
\ No newline at end of file
+{{ template "footer" . }} {{ end }}
\ No newline at end of file
diff --git a/src/frontend/templates/footer.html b/src/frontend/templates/footer.html
index 0ac6e771c53..ca3cbc4ad77 100755
--- a/src/frontend/templates/footer.html
+++ b/src/frontend/templates/footer.html
@@ -19,8 +19,8 @@
 <footer class="py-5">
     <div class="footer-top">
         <div class="container footer-social">
-            <p class="footer-text">This website is hosted for demo purposes only. It is not an actual shop. This is not a Google product.</p>
-            <p class="footer-text">© 2020 Google Inc (<a href="https://github.com/GoogleCloudPlatform/microservices-demo">Source Code</a>)</p>
+            <p class="footer-text">This webapp was hosted for presentation purposes only. It is not an actual shop.</p>
+            <p class="footer-text">© 2024 AYOARIYO EMMAUEL MSC PROJECT </p>
             <p class="footer-text">
                 <small>
                     {{ if $.session_id }}session-id: {{ $.session_id }} — {{end}}
@@ -30,10 +30,9 @@
         </div>
     </div>
 </footer>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js"
-    integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous">
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous">
 </script>
 </body>
 
 </html>
-{{ end }}
+{{ end }}
\ No newline at end of file
diff --git a/src/frontend/templates/home.html b/src/frontend/templates/home.html
index 0281d6db2f7..8be2a769042 100755
--- a/src/frontend/templates/home.html
+++ b/src/frontend/templates/home.html
@@ -14,52 +14,48 @@
  limitations under the License.
 -->
 
-{{ define "home" }}
-
-{{ template "header" . }}
+{{ define "home" }} {{ template "header" . }}
 <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
-  <span class="platform-flag">
-    {{$.platform_name}}
+    <span class="platform-flag">
+  EMMA STORE
   </span>
 </div>
 <main role="main" class="home">
-  <section class="jumbotron text-center mb-0 h-jumbotron">
-    <div class="container">
-      <img src="/static/icons/Hipster_HeroLogo.svg" alt="Online Boutique" class="icon search-icon" />
-    </div>
-  </section>
+    <section class="jumbotron text-center mb-0 h-jumbotron">
+        <div class="container">
+            <img src="/static/icons/Hipster_HeroLogo.svg" alt="Online Boutique" class="icon search-icon" />
+        </div>
+    </section>
 
-  <div class="h-grid py-5 bg-light">
-    <div class="container">
-      <div class="row h-row">
-        <img src="/static/icons/Hipster_HotProducts.svg" alt="Hot products" class="icon search-icon" />
-      </div>
-      <div class="row">
-        {{ range $.products }}
-        <div class="col-md-4">
-          <div class="h-card card mb-4 box-shadow">
-            <a href="/product/{{.Item.Id}}">
-              <img alt="" style="width: 100%; height: auto;" src="{{.Item.Picture}}">
-              <div class="card-hover"></div>
-            </a>
-            <div class="card-body h-card-body">
-              <h5 class="card-title h-card-title">
-                {{ .Item.Name }}
-              </h5>
-              <div class="d-flex justify-content-center align-items-center">
-                <small class="text-muted">
+    <div class="h-grid py-5 bg-light">
+        <div class="container">
+            <div class="row h-row">
+                <img src="/static/icons/Hipster_HotProducts.svg" alt="Hot products" class="icon search-icon" />
+            </div>
+            <div class="row">
+                {{ range $.products }}
+                <div class="col-md-4">
+                    <div class="h-card card mb-4 box-shadow">
+                        <a href="/product/{{.Item.Id}}">
+                            <img alt="" style="width: 100%; height: auto;" src="{{.Item.Picture}}">
+                            <div class="card-hover"></div>
+                        </a>
+                        <div class="card-body h-card-body">
+                            <h5 class="card-title h-card-title">
+                                {{ .Item.Name }}
+                            </h5>
+                            <div class="d-flex justify-content-center align-items-center">
+                                <small class="text-muted">
                   {{ renderMoney .Price }}
                 </small>
-              </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                {{ end }}
             </div>
-          </div>
         </div>
-        {{ end }}
-      </div>
     </div>
-  </div>
 </main>
 
-{{ template "footer" . }}
-
-{{ end }}
\ No newline at end of file
+{{ template "footer" . }} {{ end }}
\ No newline at end of file
diff --git a/src/frontend/templates/order.html b/src/frontend/templates/order.html
index ecceb00594c..75cbb3b3f37 100755
--- a/src/frontend/templates/order.html
+++ b/src/frontend/templates/order.html
@@ -14,44 +14,40 @@
  limitations under the License.
 -->
 
-{{ define "order" }}
-    {{ template "header" . }}
-    <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
-        <span class="platform-flag">
-          {{$.platform_name}}
+{{ define "order" }} {{ template "header" . }}
+<div {{ with $.platform_css }} class="{{.}}" {{ end }}>
+    <span class="platform-flag">
+        EMMA STORE
         </span>
-      </div>
-    <main role="main" class="order">
-        <div class="py-5">
-            <div class="container py-3 px-lg-5">
-                <div class="row mt-5 py-2">
-                    <div class="col text-center">
-                        <img class="order-logo" src="/static/icons/Hipster_HeroLogoCyan.svg" alt="Online Boutique" />
-                        <h3>
-                            Your order is complete!
-                        </h3>
-                        <p>Order Confirmation ID</p>
-                        <p class="mg-bt"><strong>{{.order.OrderId}}</strong></p>
-                        <p>Shipping Tracking ID</p>
-                        <p class="mg-bt"><strong>{{.order.ShippingTrackingId}}</strong></p>
-                        <p>Shipping Cost</p>
-                        <p class="mg-bt"><strong>{{renderMoney .order.ShippingCost}}</strong></p>
-                        <p>Total Paid</p>
-                        <p class="mg-bt"><strong>{{renderMoney .total_paid}}</strong></p>
-                    </div>
+</div>
+<main role="main" class="order">
+    <div class="py-5">
+        <div class="container py-3 px-lg-5">
+            <div class="row mt-5 py-2">
+                <div class="col text-center">
+                    <img class="order-logo" src="/static/icons/Hipster_HeroLogoCyan.svg" alt="Online Boutique" />
+                    <h3>
+                        Your order is complete!
+                    </h3>
+                    <p>Order Confirmation ID</p>
+                    <p class="mg-bt"><strong>{{.order.OrderId}}</strong></p>
+                    <p>Shipping Tracking ID</p>
+                    <p class="mg-bt"><strong>{{.order.ShippingTrackingId}}</strong></p>
+                    <p>Shipping Cost</p>
+                    <p class="mg-bt"><strong>{{renderMoney .order.ShippingCost}}</strong></p>
+                    <p>Total Paid</p>
+                    <p class="mg-bt"><strong>{{renderMoney .total_paid}}</strong></p>
                 </div>
-
             </div>
-            <div class="container py-3 px-lg-5">
-                <div class="row py-2 text-center">
-                    <a class="btn btn-info" href="/" role="button" style="margin-top: 40px; margin-bottom: 40px;">Keep Browsing</a>
-                </div>
+
+        </div>
+        <div class="container py-3 px-lg-5">
+            <div class="row py-2 text-center">
+                <a class="btn btn-info" href="/" role="button" style="margin-top: 40px; margin-bottom: 40px;">Keep Browsing</a>
             </div>
-            {{ if $.recommendations }}
-                {{ template "recommendations" $.recommendations }}
-            {{ end }}
         </div>
-    </main>
+        {{ if $.recommendations }} {{ template "recommendations" $.recommendations }} {{ end }}
+    </div>
+</main>
 
-    {{ template "footer" . }}
-    {{ end }}
+{{ template "footer" . }} {{ end }}
\ No newline at end of file
diff --git a/src/frontend/templates/product.html b/src/frontend/templates/product.html
index ce589183716..88bb17a0d02 100755
--- a/src/frontend/templates/product.html
+++ b/src/frontend/templates/product.html
@@ -14,39 +14,38 @@
  limitations under the License.
 -->
 
-{{ define "product" }}
-{{ template "header" . }}
+{{ define "product" }} {{ template "header" . }}
 <div {{ with $.platform_css }} class="{{.}}" {{ end }}>
-  <span class="platform-flag">
-    {{$.platform_name}}
+    <span class="platform-flag">
+  EMMA STORE
   </span>
 </div>
 
 <main role="main">
-  <div class="h-product">
-    <div class="row">
-      <div class="col">
-        <img alt="" src="{{$.product.Item.Picture}}" />
-      </div>
-      <div class="product-info col">
-        <div class="product-wrapper">
-          <h2>{{$.product.Item.Name}}</h2>
+    <div class="h-product">
+        <div class="row">
+            <div class="col">
+                <img alt="" src="{{$.product.Item.Picture}}" />
+            </div>
+            <div class="product-info col">
+                <div class="product-wrapper">
+                    <h2>{{$.product.Item.Name}}</h2>
 
-          <p class="text-muted">
-            {{ renderMoney $.product.Price}}
-          </p>
-          <div>
-            <h6>Product Description:</h6>
-            {{$.product.Item.Description}}
-          </div>
+                    <p class="text-muted">
+                        {{ renderMoney $.product.Price}}
+                    </p>
+                    <div>
+                        <h6>Product Description:</h6>
+                        {{$.product.Item.Description}}
+                    </div>
 
-          <form method="POST" action="/cart" class="form-inline">
-            <input type="hidden" name="product_id" value="{{$.product.Item.Id}}" />
-            <div class="input-group">
-              <div class="input-group-prepend">
-                <label class="input-group-text" for="quantity">Quantity</label>
-              </div>
-              <select name="quantity" id="quantity" class="custom-select form-control form-control-lg">
+                    <form method="POST" action="/cart" class="form-inline">
+                        <input type="hidden" name="product_id" value="{{$.product.Item.Id}}" />
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <label class="input-group-text" for="quantity">Quantity</label>
+                            </div>
+                            <select name="quantity" id="quantity" class="custom-select form-control form-control-lg">
                 <option>1</option>
                 <option>2</option>
                 <option>3</option>
@@ -54,21 +53,16 @@ <h6>Product Description:</h6>
                 <option>5</option>
                 <option>10</option>
               </select>
-              <button type="submit" class="btn btn-info btn-lg ml-3">Add to Cart</button>
+                            <button type="submit" class="btn btn-info btn-lg ml-3">Add to Cart</button>
+                        </div>
+                    </form>
+                </div>
             </div>
-          </form>
         </div>
-      </div>
     </div>
-  </div>
-  <div class="container py-3 px-lg-5 py-lg-5">
-    {{ if $.recommendations}}
-      {{ template "recommendations" $.recommendations }}
-    {{ end }}
-
-   {{ with $.ad }}{{ template "text_ad" . }}{{ end}}
+    <div class="container py-3 px-lg-5 py-lg-5">
+        {{ if $.recommendations}} {{ template "recommendations" $.recommendations }} {{ end }} {{ with $.ad }}{{ template "text_ad" . }}{{ end}}
 
-  </div>
+    </div>
 </main>
-{{ template "footer" . }}
-{{ end }}
\ No newline at end of file
+{{ template "footer" . }} {{ end }}
\ No newline at end of file
diff --git a/src/paymentservice/Dockerfile b/src/paymentservice/Dockerfile
index bc39a50dd66..44c7d1da3d9 100644
--- a/src/paymentservice/Dockerfile
+++ b/src/paymentservice/Dockerfile
@@ -19,7 +19,7 @@ FROM base as builder
 # Some packages (e.g. @google-cloud/profiler) require additional
 # deps for post-install scripts
 RUN apk add --update --no-cache \
-    python \
+    python3 \
     make \
     g++