reorganized NavigationDrawerFragment