Add navigability; tweak wording