diff --git a/src/admin/routes/catalog.js b/src/admin/routes/catalog.js
index 329050d..b3d61b5 100644
--- a/src/admin/routes/catalog.js
+++ b/src/admin/routes/catalog.js
@@ -30,12 +30,12 @@ function buildTreeHtml(tree, csrf) {
             subHtml += `
               <div class="accordion-item border-0">
                 <h2 class="accordion-header">
-                  <button class="accordion-button collapsed py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${subId}">
+                  <button class="accordion-button py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${subId}">
                     <span class="node-label text-decoration-none${subDisabled ? ' text-muted' : ' text-dark'}" data-sub="${s.id}">${esc(s.name)}${subDisabled ? ' <span class="badge bg-secondary ms-1">Disabled</span>' : ''}</span>
                     <span class="badge bg-secondary ms-2">${s.pc||0}</span>
                   </button>
                 </h2>
-                <div id="${subId}" class="accordion-collapse collapse" data-bs-parent="#${catId}">
+                <div id="${subId}" class="accordion-collapse collapse show" data-bs-parent="#${catId}">
                   <div class="accordion-body py-2">
                     <form method="POST" action="/catalog/subcategories/${s.id}/update" class="d-inline-flex gap-1 align-items-center mb-1">
                       ${csrfInput}
@@ -58,12 +58,12 @@ function buildTreeHtml(tree, csrf) {
           catHtml += `
             <div class="accordion-item border-0">
               <h2 class="accordion-header">
-                <button class="accordion-button collapsed py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${catId}">
+                <button class="accordion-button py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${catId}">
                   <span class="node-label text-decoration-none${catDisabled ? ' text-muted' : ' text-dark'}" data-cat="${c.id}">${esc(c.name)}${catDisabled ? ' <span class="badge bg-secondary ms-1">Disabled</span>' : ''}</span>
                   <span class="badge bg-secondary ms-2">${catCount}</span>
                 </button>
               </h2>
-              <div id="${catId}" class="accordion-collapse collapse" data-bs-parent="#${districtId}">
+              <div id="${catId}" class="accordion-collapse collapse show" data-bs-parent="#${districtId}">
                 <div class="accordion-body py-2">
                   ${subHtml}
                   <form method="POST" action="/catalog/categories/${c.id}/update" class="d-inline-flex gap-1 align-items-center mt-2">
@@ -88,12 +88,12 @@ function buildTreeHtml(tree, csrf) {
         districtHtml += `
           <div class="accordion-item border-0">
             <h2 class="accordion-header">
-              <button class="accordion-button collapsed py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${districtId}">
+              <button class="accordion-button py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${districtId}">
                 <span class="node-label text-decoration-none${locDisabled ? ' text-muted' : ' text-dark'}" data-loc="${ldata.id}">${esc(district)}${locDisabled ? ' <span class="badge bg-secondary ms-1">Disabled</span>' : ''}</span>
                 <span class="badge bg-secondary ms-2">${districtCount}</span>
               </button>
             </h2>
-            <div id="${districtId}" class="accordion-collapse collapse" data-bs-parent="#${cityId}">
+            <div id="${districtId}" class="accordion-collapse collapse show" data-bs-parent="#${cityId}">
               <div class="accordion-body py-2">
                 ${catHtml}
                 <form method="POST" action="/catalog/locations/${ldata.id}/update" class="d-inline-flex gap-1 align-items-center mt-2">
@@ -125,12 +125,12 @@ function buildTreeHtml(tree, csrf) {
       cityHtml += `
         <div class="accordion-item border-0">
           <h2 class="accordion-header">
-            <button class="accordion-button collapsed py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${cityId}">
+            <button class="accordion-button py-2" type="button" data-bs-toggle="collapse" data-bs-target="#${cityId}">
               <span class="node-label text-decoration-none text-dark" data-city="${esc(city)}" data-country="${esc(country)}">${esc(city)}</span>
               <span class="badge bg-secondary ms-2">${cityCount}</span>
             </button>
           </h2>
-          <div id="${cityId}" class="accordion-collapse collapse" data-bs-parent="#${countryId}">
+          <div id="${cityId}" class="accordion-collapse collapse show" data-bs-parent="#${countryId}">
             <div class="accordion-body py-2">
               ${districtHtml}
               <form method="POST" action="/catalog/locations/add-district" class="d-inline-flex gap-2 mt-2">
@@ -148,11 +148,11 @@ function buildTreeHtml(tree, csrf) {
     treeHtml += `
       <div class="accordion-item">
         <h2 class="accordion-header">
-          <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#${countryId}">
+          <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#${countryId}">
             <strong>${esc(country)}</strong> <span class="badge bg-secondary ms-2">${countryCount}</span>
           </button>
         </h2>
-        <div id="${countryId}" class="accordion-collapse collapse" data-bs-parent="#catalogTree">
+        <div id="${countryId}" class="accordion-collapse collapse show" data-bs-parent="#catalogTree">
           <div class="accordion-body p-0">
             ${cityHtml}
             <form method="POST" action="/catalog/locations/add-city" class="d-inline-flex gap-2 p-3 pt-0">
diff --git a/src/admin/views/catalog.ejs b/src/admin/views/catalog.ejs
index 141f06f..3f2e82d 100644
--- a/src/admin/views/catalog.ejs
+++ b/src/admin/views/catalog.ejs
@@ -5,6 +5,16 @@
 </div>
 <% } %>
 
+<div class="panel panel-icon mb-3">
+    <div class="panel-hdr d-flex justify-content-between align-items-center">
+        <h2>Catalog Management</h2>
+        <div class="d-flex gap-2">
+            <a href="/locations" class="btn btn-sm btn-outline-primary">📍 Manage Locations</a>
+            <a href="/categories" class="btn btn-sm btn-outline-primary">🗂️ Manage Categories</a>
+        </div>
+    </div>
+</div>
+
 <div class="row">
     <div class="col-md-4">
         <div class="panel">
diff --git a/src/admin/views/categories.ejs b/src/admin/views/categories.ejs
index d4162aa..080bc69 100644
--- a/src/admin/views/categories.ejs
+++ b/src/admin/views/categories.ejs
@@ -1,3 +1,4 @@
+<a href="/catalog" class="btn btn-sm btn-outline-secondary mb-2">« Back to Catalog</a>
 <div class="panel panel-icon">
     <div class="panel-hdr">
         <h2>Categories</h2>
diff --git a/src/admin/views/locations.ejs b/src/admin/views/locations.ejs
index c2602c9..bd693c6 100644
--- a/src/admin/views/locations.ejs
+++ b/src/admin/views/locations.ejs
@@ -1,3 +1,4 @@
+<a href="/catalog" class="btn btn-sm btn-outline-secondary mb-2">« Back to Catalog</a>
 <div class="panel panel-icon mb-3">
     <div class="panel-hdr">
         <h2 class="d-flex align-items-center gap-2">