NavigationDrawer enhancements