changes to settings page
merge