Update some wording and navigations