diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index 0789374a..c66559ff 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -23,40 +23,7 @@
     <!-- /Search -->
 
     <ul class="navbar-nav flex-row align-items-center ms-auto">
-      <%-- Language -->
-	  <li class="nav-item dropdown-language dropdown me-2 me-xl-0">
-		<a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);" data-bs-toggle="dropdown">
-		  <i class="fi fi-us fis rounded-circle fs-3 me-1"></i>
-		</a>
-		<ul class="dropdown-menu dropdown-menu-end">
-		  <li>
-			<a class="dropdown-item" href="javascript:void(0);" data-language="en">
-			  <i class="fi fi-us fis rounded-circle fs-4 me-1"></i>
-			  <span class="align-middle">English</span>
-			</a>
-		  </li>
-		  <li>
-			<a class="dropdown-item" href="javascript:void(0);" data-language="fr">
-			  <i class="fi fi-fr fis rounded-circle fs-4 me-1"></i>
-			  <span class="align-middle">France</span>
-			</a>
-		  </li>
-		  <li>
-			<a class="dropdown-item" href="javascript:void(0);" data-language="de">
-			  <i class="fi fi-de fis rounded-circle fs-4 me-1"></i>
-			  <span class="align-middle">German</span>
-			</a>
-		  </li>
-		  <li>
-			<a class="dropdown-item" href="javascript:void(0);" data-language="pt">
-			  <i class="fi fi-pt fis rounded-circle fs-4 me-1"></i>
-			  <span class="align-middle">Portuguese</span>
-			</a>
-		  </li>
-		</ul>
-	  </li>
-	  <!--/ Language --%>
-
+      
       <!-- Style Switcher -->
       <li class="nav-item me-2 me-xl-0">
         <a class="nav-link style-switcher-toggle hide-arrow" href="javascript:void(0);">
@@ -65,343 +32,7 @@
       </li>
       <!--/ Style Switcher -->
 
-      <%-- Quick links  -->
-	  <li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
-		<a
-		  class="nav-link dropdown-toggle hide-arrow"
-		  href="javascript:void(0);"
-		  data-bs-toggle="dropdown"
-		  data-bs-auto-close="outside"
-		  aria-expanded="false"
-		>
-		  <i class="bx bx-grid-alt bx-sm"></i>
-		</a>
-		<div class="dropdown-menu dropdown-menu-end py-0">
-		  <div class="dropdown-menu-header border-bottom">
-			<div class="dropdown-header d-flex align-items-center py-3">
-			  <h5 class="text-body mb-0 me-auto">Shortcuts</h5>
-			  <a
-				href="javascript:void(0)"
-				class="dropdown-shortcuts-add text-body"
-				data-bs-toggle="tooltip"
-				data-bs-placement="top"
-				title="Add shortcuts"
-				><i class="bx bx-sm bx-plus-circle"></i
-			  ></a>
-			</div>
-		  </div>
-		  <div class="dropdown-shortcuts-list scrollable-container">
-			<div class="row row-bordered overflow-visible g-0">
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-calendar fs-4"></i>
-				</span>
-				<a href="app-calendar.html" class="stretched-link">Calendar</a>
-				<small class="text-muted mb-0">Appointments</small>
-			  </div>
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-food-menu fs-4"></i>
-				</span>
-				<a href="app-invoice-list.html" class="stretched-link">Invoice App</a>
-				<small class="text-muted mb-0">Manage Accounts</small>
-			  </div>
-			</div>
-			<div class="row row-bordered overflow-visible g-0">
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-user fs-4"></i>
-				</span>
-				<a href="app-user-list.html" class="stretched-link">User App</a>
-				<small class="text-muted mb-0">Manage Users</small>
-			  </div>
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-check-shield fs-4"></i>
-				</span>
-				<a href="app-access-roles.html" class="stretched-link">Role Management</a>
-				<small class="text-muted mb-0">Permission</small>
-			  </div>
-			</div>
-			<div class="row row-bordered overflow-visible g-0">
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-pie-chart-alt-2 fs-4"></i>
-				</span>
-				<a href="index.html" class="stretched-link">Dashboard</a>
-				<small class="text-muted mb-0">User Profile</small>
-			  </div>
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-cog fs-4"></i>
-				</span>
-				<a href="pages-account-settings-account.html" class="stretched-link">Setting</a>
-				<small class="text-muted mb-0">Account Settings</small>
-			  </div>
-			</div>
-			<div class="row row-bordered overflow-visible g-0">
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-help-circle fs-4"></i>
-				</span>
-				<a href="pages-help-center-landing.html" class="stretched-link">Help Center</a>
-				<small class="text-muted mb-0">FAQs & Articles</small>
-			  </div>
-			  <div class="dropdown-shortcuts-item col">
-				<span class="dropdown-shortcuts-icon bg-label-secondary rounded-circle mb-2">
-				  <i class="bx bx-window-open fs-4"></i>
-				</span>
-				<a href="modal-examples.html" class="stretched-link">Modals</a>
-				<small class="text-muted mb-0">Useful Popups</small>
-			  </div>
-			</div>
-		  </div>
-		</div>
-	  </li>
-	  <!-- Quick links --%>
-
-      <%-- Notification -->
-	  <li class="nav-item dropdown-notifications navbar-dropdown dropdown me-3 me-xl-1">
-		<a
-		  class="nav-link dropdown-toggle hide-arrow"
-		  href="javascript:void(0);"
-		  data-bs-toggle="dropdown"
-		  data-bs-auto-close="outside"
-		  aria-expanded="false"
-		>
-		  <i class="bx bx-bell bx-sm"></i>
-		  <span class="badge bg-danger rounded-pill badge-notifications">5</span>
-		</a>
-		<ul class="dropdown-menu dropdown-menu-end py-0">
-		  <li class="dropdown-menu-header border-bottom">
-			<div class="dropdown-header d-flex align-items-center py-3">
-			  <h5 class="text-body mb-0 me-auto">Notification</h5>
-			  <a
-				href="javascript:void(0)"
-				class="dropdown-notifications-all text-body"
-				data-bs-toggle="tooltip"
-				data-bs-placement="top"
-				title="Mark all as read"
-				><i class="bx fs-4 bx-envelope-open"></i
-			  ></a>
-			</div>
-		  </li>
-		  <li class="dropdown-notifications-list scrollable-container">
-			<ul class="list-group list-group-flush">
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <img src="<c:url value="/resources/img/avatars/1.png"/>" alt class="w-px-40 h-auto rounded-circle" />
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">Congratulation Lettie 🎉</h6>
-					<p class="mb-0">Won the monthly best seller gold badge</p>
-					<small class="text-muted">1h ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <span class="avatar-initial rounded-circle bg-label-danger">CF</span>
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">Charles Franklin</h6>
-					<p class="mb-0">Accepted your connection</p>
-					<small class="text-muted">12hr ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item marked-as-read">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <img src="<c:url value="/resources/img/avatars/2.png"/>" alt class="w-px-40 h-auto rounded-circle" />
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">New Message ✉️</h6>
-					<p class="mb-0">You have new message from Natalie</p>
-					<small class="text-muted">1h ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <span class="avatar-initial rounded-circle bg-label-success"
-						><i class="bx bx-cart"></i
-					  ></span>
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">Whoo! You have new order 🛒</h6>
-					<p class="mb-0">ACME Inc. made new order $1,154</p>
-					<small class="text-muted">1 day ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item marked-as-read">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <img src="<c:url value="/resources/img/avatars/9.png"/>" alt class="w-px-40 h-auto rounded-circle" />
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">Application has been approved 🚀</h6>
-					<p class="mb-0">Your ABC project application has been approved.</p>
-					<small class="text-muted">2 days ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item marked-as-read">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <span class="avatar-initial rounded-circle bg-label-success"
-						><i class="bx bx-pie-chart-alt"></i
-					  ></span>
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">Monthly report is generated</h6>
-					<p class="mb-0">July monthly financial report is generated</p>
-					<small class="text-muted">3 days ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item marked-as-read">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <img src="<c:url value="/resources/img/avatars/5.png"/>" alt class="w-px-40 h-auto rounded-circle" />
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">Send connection request</h6>
-					<p class="mb-0">Peter sent you connection request</p>
-					<small class="text-muted">4 days ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <img src="<c:url value="/resources/img/avatars/6.png"/>" alt class="w-px-40 h-auto rounded-circle" />
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">New message from Jane</h6>
-					<p class="mb-0">Your have new message from Jane</p>
-					<small class="text-muted">5 days ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			  <li class="list-group-item list-group-item-action dropdown-notifications-item marked-as-read">
-				<div class="d-flex">
-				  <div class="flex-shrink-0 me-3">
-					<div class="avatar">
-					  <span class="avatar-initial rounded-circle bg-label-warning"
-						><i class="bx bx-error"></i
-					  ></span>
-					</div>
-				  </div>
-				  <div class="flex-grow-1">
-					<h6 class="mb-1">CPU is running high</h6>
-					<p class="mb-0">CPU Utilization Percent is currently at 88.63%,</p>
-					<small class="text-muted">5 days ago</small>
-				  </div>
-				  <div class="flex-shrink-0 dropdown-notifications-actions">
-					<a href="javascript:void(0)" class="dropdown-notifications-read"
-					  ><span class="badge badge-dot"></span
-					></a>
-					<a href="javascript:void(0)" class="dropdown-notifications-archive"
-					  ><span class="bx bx-x"></span
-					></a>
-				  </div>
-				</div>
-			  </li>
-			</ul>
-		  </li>
-		  <li class="dropdown-menu-footer border-top">
-			<a href="javascript:void(0);" class="dropdown-item d-flex justify-content-center p-3">
-			  View all notifications
-			</a>
-		  </li>
-		</ul>
-	  </li>
-	  <!--/ Notification --%>
+      
       <!-- User -->
       <li class="nav-item navbar-dropdown dropdown-user dropdown">
         <a class="nav-link dropdown-toggle hide-arrow" href="javascript:void(0);" data-bs-toggle="dropdown">
@@ -464,16 +95,6 @@
     </ul>
   </div>
 
-  <%-- Search Small Screens -->
-  <div class="navbar-search-wrapper search-input-wrapper d-none">
-	<input
-	  type="text"
-	  class="form-control search-input container-xxl border-0"
-	  placeholder="Search..."
-	  aria-label="Search..."
-	/>
-	<i class="bx bx-x bx-sm search-toggler cursor-pointer"></i>
-  </div --%>
 </nav>
 
 
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index 7ebf234f..d369a85e 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -7,7 +7,7 @@
             <jsp:include page="/WEB-INF/jsp/include/userMenus.jsp" />
             <div class="layout-page">
                 <jsp:include page="/WEB-INF/jsp/include/top.jsp" />
-                <div id="ifrTabs" class="nav-align-top">
+                <div id="ifrTabs" class="nav-align-top mt-3">
 		            <ul class="nav nav-tabs nav-tabs-ifr"></ul>
 		        </div>
 		        <div id="ifrTabContents" class="tab-content"></div>