Worked on navigation some more.