Move menu options into the NavigationDrawer
Align NavigationDrawer separator to the design spec (in terms of color)