diff --git a/package.json b/package.json
index 6f76c9d..70730dd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bbodek-ui",
-  "version": "0.0.158",
+  "version": "0.0.160",
   "type": "module",
   "author": "Bbodek",
   "license": "MIT",
diff --git a/src/core/components/Drawer/index.tsx b/src/core/components/Drawer/index.tsx
index 4225621..16ee621 100644
--- a/src/core/components/Drawer/index.tsx
+++ b/src/core/components/Drawer/index.tsx
@@ -25,7 +25,6 @@ const Drawer = forwardRef((
       target = {target ?? "drawer"}
       ref = {ref}
       variants = {"drawer"}
-      onClose = {onClose}
       {...rest}
     >
       <Section
diff --git a/src/core/components/Modal/ModalBase/constants/index.ts b/src/core/components/Modal/ModalBase/constants/index.ts
index 5174f8b..4a98927 100644
--- a/src/core/components/Modal/ModalBase/constants/index.ts
+++ b/src/core/components/Modal/ModalBase/constants/index.ts
@@ -6,8 +6,8 @@ export const VARIANTS = {
 } as const;
 
 export const MODAL_CONTENT_POSITION: Record<VariantsType, string> = {
-  [VARIANTS.MODAL]: "fixed flex items-center justify-center",
-  [VARIANTS.DRAWER]: "flex justify-end",
+  [VARIANTS.MODAL]: "fixed flex items-center justify-center z-50",
+  [VARIANTS.DRAWER]: "flex justify-end z-40",
 } as const;
 
 export const MODAL_DIMMED_COLOR: Record<VariantsType, string> = {
diff --git a/src/core/components/Modal/ModalBase/index.tsx b/src/core/components/Modal/ModalBase/index.tsx
index 631c4c2..9e59d17 100644
--- a/src/core/components/Modal/ModalBase/index.tsx
+++ b/src/core/components/Modal/ModalBase/index.tsx
@@ -28,7 +28,7 @@ const ModalBase = forwardRef((
       <dialog
         ref = {ref}
         className = {clsx(
-          "w-full h-full open:animate-fade-in z-50",
+          "w-full h-full open:animate-fade-in",
           MODAL_CONTENT_POSITION[variants],
           dimmed && MODAL_DIMMED_COLOR[variants],
           className,