Navigation Drawer improvements