NavigationDrawer improvements