diff --git a/screen/store/components/main.js b/screen/store/components/main.js
index df8c8716..d87d383c 100644
--- a/screen/store/components/main.js
+++ b/screen/store/components/main.js
@@ -4,7 +4,7 @@ var appObjects = {
     // see https://router.vuejs.org/en/essentials/history-mode.html
     // for route path expressions see https://router.vuejs.org/en/essentials/dynamic-matching.html AND https://github.com/vuejs/vue-router/blob/dev/examples/route-matching/app.js
     router: new VueRouter({
-        // TODO sooner or later: base: storeConfig.basePath, mode: 'history',
+        mode: 'history', base: ($("#confLinkBasePath").val() || "/d"),
         routes: [
             { path: "/login", name: "login", component: storeComps.LoginPageTemplate, 
                beforeEnter: function(to, from, next){
@@ -38,8 +38,8 @@ const fixIdScrolling = {
                     document.querySelector(idToScrollTo).scrollIntoView();
                 }
             });
-        },
-    },
+        }
+    }
 };
 // TODO: leave this, reminder to use vue.min.js for production: Vue.config.productionTip = false;
 
diff --git a/screen/store/components/template/CheckoutSuccess.html b/screen/store/components/template/CheckoutSuccess.html
index 5b0e9fc1..2b0a6728 100755
--- a/screen/store/components/template/CheckoutSuccess.html
+++ b/screen/store/components/template/CheckoutSuccess.html
@@ -59,7 +59,7 @@
                 <hr class="hr-title">
                 <div class="row mb-2">
                     <span class="col text-blight">ORDER NUMBER: </span>
-                    <a class="col order-link-text" :href="'/store/d#/orders/'+orderList.orderHeader.orderId">
+                    <a class="col order-link-text" :href="'/store/d/orders/'+orderList.orderHeader.orderId">
                         {{orderList.orderHeader.orderId}}
                     </a>
                 </div>
diff --git a/screen/store/d.xml b/screen/store/d.xml
index 87757615..065892e6 100644
--- a/screen/store/d.xml
+++ b/screen/store/d.xml
@@ -111,7 +111,10 @@ along with this software (see the LICENSE.md file). If not, see
     ]]></script></pre-actions>
 
     <widgets>
-        <render-mode><text type="html"><![CDATA[<div id="app"></div>]]></text></render-mode>
+        <render-mode><text type="html"><![CDATA[
+            <input type="hidden" id="confLinkBasePath" value="${sri.currentScreenUrl.path}">
+            <div id="app"></div>
+        ]]></text></render-mode>
         <!-- TODO use server rendered footer to avoid redundant templates: <render-mode><text type="html" location="component://PopRestStore/template/store/footer.html.ftl"/></render-mode> -->
     </widgets>
 </screen>
diff --git a/template/store/navbar.html.ftl b/template/store/navbar.html.ftl
index aa7473b2..bc160d0e 100644
--- a/template/store/navbar.html.ftl
+++ b/template/store/navbar.html.ftl
@@ -80,8 +80,8 @@
                             ${partyDetail.firstName} ${partyDetail.lastName} ${partyDetail.organizationName!} <i class="fas fa-angle-down icon-down"></i>
                         </a>
                         <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
-                            <a class="dropdown-item item-color" href="/store/d#/account">Account Settings</a>
-                            <a class="dropdown-item item-color" href="/store/d#/orders">My Orders</a>
+                            <a class="dropdown-item item-color" href="/store/d/account">Account Settings</a>
+                            <a class="dropdown-item item-color" href="/store/d/orders">My Orders</a>
                             <div role="separator" class="dropdown-divider"></div>
                             <form method="get" action="/store/logOut">
                                 <button type="submit" class="dropdown-item item-color">Signout</button>
@@ -90,10 +90,10 @@
                     </li>
                 <#else>
                     <li class="nav-item">
-                        <a href="/store/d#/account/create" class="nav-link">Join Now</a>
+                        <a href="/store/d/account/create" class="nav-link">Join Now</a>
                     </li>
                     <li class="nav-item">
-                        <a href="/store/d#/login" class="nav-link"><i class="fas fa-user"></i> Sign In</a>
+                        <a href="/store/d/login" class="nav-link"><i class="fas fa-user"></i> Sign In</a>
                     </li>
                 </#if>
 
@@ -107,7 +107,7 @@
                     </#if>
                 <li class="nav-item">
                     <#if cartCount gt 0>
-                        <a class="nav-link" href="/store/d#/checkout">
+                        <a class="nav-link" href="/store/d/checkout">
                     <#else>
                         <a class="nav-link pointer" data-toggle="modal" data-target="#emptyCartModal">
                     </#if>
diff --git a/template/store/product.html.ftl b/template/store/product.html.ftl
index 1007f8e1..8ce8e0eb 100644
--- a/template/store/product.html.ftl
+++ b/template/store/product.html.ftl
@@ -13,7 +13,7 @@
     <#if addedCorrect?? && addedCorrect == 'true'>
         <div class="alert alert-primary mt-3 mb-3" role="alert">
             <i class="far fa-check-square"></i> You added a ${product.productName} to your shopping cart.
-            <a class="float-right" href="/store/d#/checkout">Go to Checkout <i class="fas fa-arrow-right"></i></a>
+            <a class="float-right" href="/store/d/checkout">Go to Checkout <i class="fas fa-arrow-right"></i></a>
         </div>
     </#if>
     <#--  <div class="row d-flex justify-content-center">