More work on the Navigation Drawer