diff --git a/src/frontend/port-forward-dependencies.sh b/src/frontend/port-forward-dependencies.sh
index dff1301..295ea05 100755
--- a/src/frontend/port-forward-dependencies.sh
+++ b/src/frontend/port-forward-dependencies.sh
@@ -2,7 +2,7 @@
 set -ex
 
 kubectl port-forward $(kubectl get pods -l app=currencyservice -o=name | head -n 1) 7000:7000 &
-kubectl port-forward $(kubectl get pods -l app=recommendationservice -o=name | head -n 1) 8081:8080 &
+kubectl port-forward $(kubectl get pods -l app=recommendationservice -o=name | head -n 1) 8021:8080 &
 kubectl port-forward $(kubectl get pods -l app=cartservice -o=name | head -n 1) 7070:7070 &
 kubectl port-forward $(kubectl get pods -l app=productcatalogservice -o=name | head -n 1) 3550:3550 &
 kubectl port-forward $(kubectl get pods -l app=checkoutservice -o=name | head -n 1) 5050:5050 &
diff --git a/src/frontend/templates/header.html b/src/frontend/templates/header.html
index 36dadae..62444cf 100644
--- a/src/frontend/templates/header.html
+++ b/src/frontend/templates/header.html
@@ -19,7 +19,7 @@
                 {{ if $.currencies }}
                 <form class="form-inline ml-auto" method="POST" action="/setCurrency" id="currency_form">
                     <select name="currency_code" class="form-control"
-                    onchange="document.getElementById('currency_form').submit();">
+                    onchange="document.getElementById('currency_form').submit();" style="width:auto;">
                     {{range $.currencies}}
                         <option value="{{.}}" {{if eq . $.user_currency}}selected="selected"{{end}}>{{.}}</option>
                     {{end}}
diff --git a/src/frontend/templates/product.html b/src/frontend/templates/product.html
index a6fe9b0..5936054 100644
--- a/src/frontend/templates/product.html
+++ b/src/frontend/templates/product.html
@@ -36,8 +36,8 @@
                                         <option>5</option>
                                         <option>10</option>
                                     </select>
+                                    <button type="submit" class="btn btn-info btn-lg ml-3">Add to Cart</button>
                                 </div>
-                                <button type="submit" class="btn btn-info btn-lg ml-3">Add to Cart</button>
                             </form>
                     </div>
                 </div>