Minor cleanup. Fix the navigation.

Need to figure out transitions for DrawerLayout initiated screens.