Hacked navigation plus wording fixes. Refs #12.