Fixed up navigation UX and screen.