Refactor NavigationDrawer
Merge branch 'navigation'