Nav Drawer fixes, v91