Remove obsolete code.
Change wording.
Work on navigation.