Updated fix with Drawer z-index