Goals - Update settings to use consistent UX and design - Re-organize settings