Edit preference page
Merge branch 'updating-users'