Drawer Menu Fixes