diff --git a/GanjooRazor/Areas/Admin/Pages/_ViewImports.cshtml b/GanjooRazor/Areas/Admin/Pages/_ViewImports.cshtml
new file mode 100644
index 00000000..a757b413
--- /dev/null
+++ b/GanjooRazor/Areas/Admin/Pages/_ViewImports.cshtml
@@ -0,0 +1 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index 3b498606..7a7b62f8 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="~/css/site.css" />
     <link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
     <link href="/css/p8.css?version=86" rel="stylesheet" type="text/css" />
+    <link href="/css/user-panel.css?version=1" rel="stylesheet" type="text/css" />
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="~/lib/jquery/dist/jquery.min.js"></script>
@@ -433,85 +434,46 @@
                 </button>
                 <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
                     <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="ReviewEdits">ویرایش‌ها</a>
+                        <li class="nav-item dropdown">
+                            <a class="nav-link text-dark dropdown-toggle" href="#" id="adminReviewDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">بررسی و تأیید</a>
+                            <div class="dropdown-menu" aria-labelledby="adminReviewDropdown">
+                                <a class="dropdown-item" asp-area="Admin" asp-page="ReviewEdits">ویرایش‌ها</a>
+                                <a class="dropdown-item" asp-area="Admin" asp-page="ReviewPartEdits">ویرایش‌های قطعات</a>
+                                <a class="dropdown-item" asp-area="Admin" asp-page="ReviewCatEdits">ویرایش‌های زندگینامه‌ها</a>
+                                <a class="dropdown-item" asp-area="Admin" asp-page="ReviewQuoteds">مشق‌ها</a>
+                            </div>
                         </li>
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="ReviewPartEdits">ویرایش‌های قطعات</a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="ReviewCatEdits">ویرایش‌های زندگینامه‌ها</a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="ReviewQuoteds">مشق‌ها</a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
+
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="Admin" asp-page="Poets">سخنوران</a>
                         </li>
 
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="Banners">آگاهی‌ها</a>
+                        <li class="nav-item dropdown">
+                            <a class="nav-link text-dark dropdown-toggle" href="#" id="adminSiteDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">مالی و سایت</a>
+                            <div class="dropdown-menu" aria-labelledby="adminSiteDropdown">
+                                <a class="dropdown-item" asp-area="Admin" asp-page="Banners">آگاهی‌ها</a>
+                                <a class="dropdown-item" asp-area="Admin" asp-page="Donations">کمک‌های مالی</a>
+                                <a class="dropdown-item" asp-area="Admin" asp-page="Expenses">هزینه‌ها</a>
+                                <a class="dropdown-item" asp-area="Admin" asp-page="LongRunningJobs">کارها</a>
+                            </div>
                         </li>
-
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="Donations">کمک‌های مالی</a>
-                        </li>
-
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="Expenses">هزینه‌ها</a>
-                        </li>
-
-                    </ul>
-                </div>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="Admin" asp-page="LongRunningJobs">کارها</a>
-                        </li>
-
                     </ul>
                 </div>
             </div>
         </nav>
     </header>
-    <div class="container">
+    <div class="container up-shell">
         <main role="main" class="pb-3">
             @RenderBody()
         </main>
     </div>
 
-
+    <partial name="_Toasts" />
+    <partial name="_ConfirmModal" />
 
     <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/js/site.js" asp-append-version="true"></script>
+    <script src="/js/user-panel.js?version=1"></script>
 
     @await RenderSectionAsync("Scripts", required: false)
 
diff --git a/GanjooRazor/Areas/User/Pages/Shared/_ConfirmModal.cshtml b/GanjooRazor/Pages/Shared/_ConfirmModal.cshtml
similarity index 100%
rename from GanjooRazor/Areas/User/Pages/Shared/_ConfirmModal.cshtml
rename to GanjooRazor/Pages/Shared/_ConfirmModal.cshtml
diff --git a/GanjooRazor/Areas/User/Pages/Shared/_EmptyState.cshtml b/GanjooRazor/Pages/Shared/_EmptyState.cshtml
similarity index 100%
rename from GanjooRazor/Areas/User/Pages/Shared/_EmptyState.cshtml
rename to GanjooRazor/Pages/Shared/_EmptyState.cshtml
diff --git a/GanjooRazor/Areas/User/Pages/Shared/_Pagination.cshtml b/GanjooRazor/Pages/Shared/_Pagination.cshtml
similarity index 100%
rename from GanjooRazor/Areas/User/Pages/Shared/_Pagination.cshtml
rename to GanjooRazor/Pages/Shared/_Pagination.cshtml
diff --git a/GanjooRazor/Areas/User/Pages/Shared/_ReviewResultBadge.cshtml b/GanjooRazor/Pages/Shared/_ReviewResultBadge.cshtml
similarity index 100%
rename from GanjooRazor/Areas/User/Pages/Shared/_ReviewResultBadge.cshtml
rename to GanjooRazor/Pages/Shared/_ReviewResultBadge.cshtml
diff --git a/GanjooRazor/Areas/User/Pages/Shared/_Toasts.cshtml b/GanjooRazor/Pages/Shared/_Toasts.cshtml
similarity index 100%
rename from GanjooRazor/Areas/User/Pages/Shared/_Toasts.cshtml
rename to GanjooRazor/Pages/Shared/_Toasts.cshtml