Updated NavigationDrawer functions