BottomDrawer fixes