Wrapped up the new User Settings functionality