diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index 86454ea..0b3799a 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -28,7 +28,8 @@
       "Bash(grep:*)",
       "Bash(for file in CommError HTTPResponseError JsonParsingError clientIpAddress)",
       "Bash(do echo \"=== $file ===\")",
-      "Bash(done)"
+      "Bash(done)",
+      "Bash(git restore:*)"
     ]
   },
   "enableAllProjectMcpServers": true,
diff --git a/email-worker/email-templates/email-template--rent-due--en.html b/email-worker/email-templates/email-template--rent-due--en.html
index 6a1b8a6..d159efd 100644
--- a/email-worker/email-templates/email-template--rent-due--en.html
+++ b/email-worker/email-templates/email-template--rent-due--en.html
@@ -76,7 +76,7 @@
                                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
                                             <tr>
                                                 <td style="text-align: center; padding: 0 0 30px 0;">
-                                                    <a href="https://rezije.app/share/location/${shareId}"
+                                                    <a href="https://rezije.app/share/bills-due/${shareId}"
                                                        style="display: inline-block; padding: 14px 40px; background-color: #5b5ba6; color: #ffffff; text-decoration: none; font-size: 16px; font-weight: bold; border-radius: 6px; border: none;">
                                                         View Payment Details
                                                     </a>
@@ -88,7 +88,7 @@
                                             Or copy and paste this link into your browser:
                                         </p>
                                         <p style="margin: 0 0 20px 0; font-size: 13px; line-height: 20px; color: #0070F3; text-align: center; word-break: break-all;">
-                                            https://rezije.app/share/location/${shareId}
+                                            https://rezije.app/share/bills-due/${shareId}
                                         </p>
 
                                         <!-- Divider -->
diff --git a/email-worker/email-templates/email-template--rent-due--hr.html b/email-worker/email-templates/email-template--rent-due--hr.html
index 6ba35b3..7fb676a 100644
--- a/email-worker/email-templates/email-template--rent-due--hr.html
+++ b/email-worker/email-templates/email-template--rent-due--hr.html
@@ -76,7 +76,7 @@
                                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
                                             <tr>
                                                 <td style="text-align: center; padding: 0 0 30px 0;">
-                                                    <a href="https://rezije.app/share/location/${shareId}"
+                                                    <a href="https://rezije.app/share/bills-due/${shareId}"
                                                        style="display: inline-block; padding: 14px 40px; background-color: #5b5ba6; color: #ffffff; text-decoration: none; font-size: 16px; font-weight: bold; border-radius: 6px; border: none;">
                                                         Pogledaj detalje uplate
                                                     </a>
@@ -88,7 +88,7 @@
                                             Ili kopirajte i zalijepite ovaj link u svoj preglednik:
                                         </p>
                                         <p style="margin: 0 0 20px 0; font-size: 13px; line-height: 20px; color: #0070F3; text-align: center; word-break: break-all;">
-                                            https://rezije.app/share/location/${shareId}
+                                            https://rezije.app/share/bills-due/${shareId}
                                         </p>
 
                                         <!-- Divider -->
diff --git a/email-worker/email-templates/email-template--util-bills-due--en.html b/email-worker/email-templates/email-template--util-bills-due--en.html
index 606db8b..145d130 100644
--- a/email-worker/email-templates/email-template--util-bills-due--en.html
+++ b/email-worker/email-templates/email-template--util-bills-due--en.html
@@ -76,7 +76,7 @@
                                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
                                             <tr>
                                                 <td style="text-align: center; padding: 0 0 30px 0;">
-                                                    <a href="https://rezije.app/share/location/${shareId}"
+                                                    <a href="https://rezije.app/share/bills-due/${shareId}"
                                                        style="display: inline-block; padding: 14px 40px; background-color: #5b5ba6; color: #ffffff; text-decoration: none; font-size: 16px; font-weight: bold; border-radius: 6px; border: none;">
                                                         View Payment Details
                                                     </a>
@@ -88,7 +88,7 @@
                                             Or copy and paste this link into your browser:
                                         </p>
                                         <p style="margin: 0 0 20px 0; font-size: 13px; line-height: 20px; color: #0070F3; text-align: center; word-break: break-all;">
-                                            https://rezije.app/share/location/${shareId}
+                                            https://rezije.app/share/bills-due/${shareId}
                                         </p>
 
                                         <!-- Divider -->
diff --git a/email-worker/email-templates/email-template--util-bills-due--hr.html b/email-worker/email-templates/email-template--util-bills-due--hr.html
index 35fc6f1..96be63f 100644
--- a/email-worker/email-templates/email-template--util-bills-due--hr.html
+++ b/email-worker/email-templates/email-template--util-bills-due--hr.html
@@ -76,7 +76,7 @@
                                         <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
                                             <tr>
                                                 <td style="text-align: center; padding: 0 0 30px 0;">
-                                                    <a href="https://rezije.app/share/location/${shareId}"
+                                                    <a href="https://rezije.app/share/bills-due/${shareId}"
                                                        style="display: inline-block; padding: 14px 40px; background-color: #5b5ba6; color: #ffffff; text-decoration: none; font-size: 16px; font-weight: bold; border-radius: 6px; border: none;">
                                                         Pogledaj detalje uplate
                                                     </a>
@@ -88,7 +88,7 @@
                                             Ili kopirajte i zalijepite ovaj link u svoj preglednik:
                                         </p>
                                         <p style="margin: 0 0 20px 0; font-size: 13px; line-height: 20px; color: #0070F3; text-align: center; word-break: break-all;">
-                                            https://rezije.app/share/location/${shareId}
+                                            https://rezije.app/share/bills-due/${shareId}
                                         </p>
 
                                         <!-- Divider -->
diff --git a/sprints/email-worker.md b/sprints/email-worker.md
index 60bc541..c6d5e0f 100644
--- a/sprints/email-worker.md
+++ b/sprints/email-worker.md
@@ -113,7 +113,7 @@ Address: BillingLocation-tenantEmail
 
 <p>Your rent for the apartment ${location.name} is due today.</p>
 
-<p>For details and payment options please click the following link: <a href="https://rezije.app/share/location/rent/${shareId}">Rent details</a></p>
+<p>For details and payment options please click the following link: <a href="https://rezije.app/share/bills-due/${shareId}">Rent details</a></p>
 
 <p>Thank you!</p>
 
@@ -154,7 +154,7 @@ Address: BillingLocation-tenantEmail
 
 <p>Your utility bills for the apartment ${location.name} are due today.</p>
 
-<p>For details and payment options please click the following link: <a href="https://rezije.app/share/location/bills/${shareId}">Utility Bills</a></p>
+<p>For details and payment options please click the following link: <a href="https://rezije.app/share/bills-due/${shareId}">Utility Bills</a></p>
 
 <p>Thank you!</p>
 
diff --git a/web-app/app/[locale]/share/location/[id]/LocationViewPage.tsx b/web-app/app/[locale]/share/bills-due/[id]/LocationViewPage.tsx
similarity index 100%
rename from web-app/app/[locale]/share/location/[id]/LocationViewPage.tsx
rename to web-app/app/[locale]/share/bills-due/[id]/LocationViewPage.tsx
diff --git a/web-app/app/[locale]/share/location/[id]/page.tsx b/web-app/app/[locale]/share/bills-due/[id]/page.tsx
similarity index 100%
rename from web-app/app/[locale]/share/location/[id]/page.tsx
rename to web-app/app/[locale]/share/bills-due/[id]/page.tsx
diff --git a/web-app/app/lib/actions/billActions.ts b/web-app/app/lib/actions/billActions.ts
index a60ea3a..1438dc2 100644
--- a/web-app/app/lib/actions/billActions.ts
+++ b/web-app/app/lib/actions/billActions.ts
@@ -627,7 +627,7 @@ export const uploadProofOfPayment = async (
     await cleanupExpiredShares(dbClient);
 
     // 8. REVALIDATE CACHE
-    revalidatePath(`/share/location/${shareId}`, 'page');
+    revalidatePath(`/share/bills-due/${shareId}`, 'page');
 
     return { success: true };
 
diff --git a/web-app/app/lib/actions/locationActions.ts b/web-app/app/lib/actions/locationActions.ts
index be5da4c..f11c4e5 100644
--- a/web-app/app/lib/actions/locationActions.ts
+++ b/web-app/app/lib/actions/locationActions.ts
@@ -775,7 +775,7 @@ export const uploadUtilBillsProofOfPayment = async (
             );
 
         // 7. REVALIDATE CACHE
-        revalidatePath(`/share/location/${shareId}`, 'page');
+        revalidatePath(`/share/bills-due/${shareId}`, 'page');
 
         return { success: true };
     } catch (error: any) {
@@ -823,7 +823,7 @@ export const generateShareLink = withUser(
 
     // Build share URL
     const baseUrl = process.env.NEXTAUTH_URL || 'http://localhost:3000';
-    const shareUrl = `${baseUrl}/share/location/${shareId}`;
+    const shareUrl = `${baseUrl}/share/bills-due/${shareId}`;
 
     return { shareUrl };
   }
diff --git a/web-app/app/ui/ViewBillCard.tsx b/web-app/app/ui/ViewBillCard.tsx
index 9f252e2..0f80257 100644
--- a/web-app/app/ui/ViewBillCard.tsx
+++ b/web-app/app/ui/ViewBillCard.tsx
@@ -167,7 +167,7 @@ export const ViewBillCard: FC<ViewBillCardProps> = ({ location, bill, shareId })
                 }
 
                 <div className="text-right">
-                    <Link className="btn btn-neutral ml-3" href={`/share/location/${shareId || locationID}`}>{t("back-button")}</Link>
+                    <Link className="btn btn-neutral ml-3" href={`/share/bills-due/${shareId || locationID}`}>{t("back-button")}</Link>
                 </div>
 
             </div>