BK-1078 Create the new user settings page
Merge branch and conflict fixed