Updates settings page navigation fix and text tweaks