diff --git a/desk/src/components/desk/global/CustomDropdown.vue b/desk/src/components/desk/global/CustomDropdown.vue
deleted file mode 100644
index c462ac6d2..000000000
--- a/desk/src/components/desk/global/CustomDropdown.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-	<Menu as="div" class="relative inline-block text-left">
-		<MenuButton>
-			<slot v-if="$slots.default"></slot>
-			<Button v-else v-bind="button">
-				{{ button ? button?.label || null : "Options" }}
-			</Button>
-		</MenuButton>
-
-		<transition
-			enter-active-class="transition duration-100 ease-out"
-			enter-from-class="transform scale-95 opacity-0"
-			enter-to-class="transform scale-100 opacity-100"
-			leave-active-class="transition duration-75 ease-in"
-			leave-from-class="transform scale-100 opacity-100"
-			leave-to-class="transform scale-95 opacity-0"
-		>
-			<MenuItems
-				class="absolute z-10 bg-white divide-y divide-gray-100 shadow-sm min-w-40 ring-1 ring-black ring-opacity-5 focus:outline-none w-full"
-				:class="
-					placement === 'left'
-						? 'left-0 origin-top-left'
-						: 'right-0 origin-top-right'
-				"
-			>
-				<div v-for="group in groups" :key="group.key" class="px-1 py-1">
-					<div
-						v-if="group.group && !group.hideLabel"
-						class="px-2 py-1 text-xs font-semibold tracking-wider text-gray-500 uppercase"
-					>
-						{{ group.group }}
-					</div>
-					<MenuItem
-						v-for="item in group.items"
-						:key="item.label"
-						v-slot="{ active }"
-					>
-						<button
-							:class="[
-								active ? 'bg-gray-100' : 'text-gray-900',
-								'group flex rounded-md items-center w-full px-2 py-2 text-sm',
-							]"
-							:onClick="item.onClick"
-						>
-							<FeatherIcon
-								v-if="item.icon"
-								:name="item.icon"
-								class="flex-shrink-0 w-4 h-4 mr-2 text-gray-500"
-								aria-hidden="true"
-							/>
-							<span class="whitespace-nowrap">
-								{{ item.label }}
-							</span>
-						</button>
-					</MenuItem>
-				</div>
-			</MenuItems>
-		</transition>
-	</Menu>
-</template>
-
-<script>
-import { Menu, MenuButton, MenuItems, MenuItem } from "@headlessui/vue"
-import { FeatherIcon } from "frappe-ui"
-
-export default {
-	name: "NewDropdown",
-	props: ["button", "options", "placement"],
-	components: {
-		Menu,
-		MenuButton,
-		MenuItems,
-		MenuItem,
-		FeatherIcon,
-	},
-	methods: {
-		normalizeDropdownItem(option) {
-			let onClick = option.handler || null
-			if (!onClick && option.route && this.$router) {
-				onClick = () => this.$router.push(option.route)
-			}
-			return {
-				label: option.label,
-				icon: option.icon,
-				group: option.group,
-				onClick,
-			}
-		},
-	},
-	computed: {
-		dropdownItems() {
-			return (this.options || [])
-				.filter(Boolean)
-				.filter((option) =>
-					option.condition ? option.condition() : true
-				)
-				.map((option) => this.normalizeDropdownItem(option))
-		},
-		groups() {
-			let groups = this.options[0]?.group
-				? this.options
-				: [{ group: "", items: this.options }]
-
-			return groups.map((group, i) => {
-				return {
-					key: i,
-					group: group.group,
-					hideLabel: group.hideLabel || false,
-					items: group.items.map((item) =>
-						this.normalizeDropdownItem(item)
-					),
-				}
-			})
-		},
-	},
-}
-</script>
diff --git a/desk/src/components/global/CustomComboboxInput.vue b/desk/src/components/global/CustomComboboxInput.vue
deleted file mode 100644
index 137a0a75d..000000000
--- a/desk/src/components/global/CustomComboboxInput.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-	<div class="relative inline-block text-left">
-		<Combobox v-model="selectedItem">
-			<ComboboxInput
-				class="rounded-md w-full border-none focus:ring-0 py-2 pl-3 pr-10 text-sm leading-5 text-gray-900 bg-slate-100"
-				autocomplete="off"
-				@change="query = $event.target.value"
-			/>
-			<ComboboxOptions
-				class="absolute z-10 mt-2 bg-white divide-y divide-gray-100 rounded-md shadow-lg min-w-40 ring-1 ring-black ring-opacity-5 focus:outline-none"
-			>
-				<div
-					v-if="filteredItems.length === 0 && query !== ''"
-					class="select-none relative py-2 px-4 text-gray-700"
-				>
-					No Results Found
-				</div>
-				<ComboboxOption
-					v-slot="{ selected, active }"
-					v-for="item in filteredItems"
-					:key="item"
-					:value="item"
-				>
-					<li
-						class="cursor-default select-none relative py-2 pl-4 pr-4 text-gray-900"
-						:class="{ 'bg-slate-50': active }"
-					>
-						<span
-							class="block truncate"
-							:class="{
-								'font-medium': selected,
-								'font-normal': !selected,
-							}"
-						>
-							{{ item }}
-						</span>
-					</li>
-				</ComboboxOption>
-			</ComboboxOptions>
-		</Combobox>
-	</div>
-</template>
-
-<script>
-import {
-	Combobox,
-	ComboboxOptions,
-	ComboboxOption,
-	ComboboxInput,
-} from "@headlessui/vue"
-import { ref } from "vue"
-
-export default {
-	name: "CustomComboboxInput",
-	props: ["options", "value"],
-	components: {
-		Combobox,
-		ComboboxOptions,
-		ComboboxOption,
-		ComboboxInput,
-	},
-	setup() {
-		const selectedItem = ref(null)
-		const query = ref(null)
-
-		return {
-			selectedItem,
-			query,
-		}
-	},
-	computed: {
-		filteredItems() {
-			return this.query === ""
-				? this.options
-				: this.options.filter((item) => {
-						return item
-							.toLowerCase()
-							.includes(this.query.toLowerCase())
-				  })
-		},
-	},
-}
-</script>
diff --git a/desk/src/components/global/ListViewer.vue b/desk/src/components/global/ListViewer.vue
index 8ba68bca3..bece05733 100644
--- a/desk/src/components/global/ListViewer.vue
+++ b/desk/src/components/global/ListViewer.vue
@@ -87,7 +87,7 @@
 								<table
 									class="w-full table-auto border-separate border-spacing-y-2"
 								>
-									<thead class="z-10 sticky top-0">
+									<thead class="z-5 sticky top-0">
 										<tr class="select-none bg-gray-100 text-base text-gray-500">
 											<th class="rounded-l-md p-3">
 												<Input
diff --git a/desk/tailwind.config.js b/desk/tailwind.config.js
index 32db13f3c..5b1fd94a7 100644
--- a/desk/tailwind.config.js
+++ b/desk/tailwind.config.js
@@ -9,6 +9,9 @@ module.exports = {
 	],
 	theme: {
 		extend: {
+			zIndex: {
+				"5": "5",
+			},
 			width: {
 				"1/24": "4.1666666667%",
 				"2/24": "8.3333333333%",