settings page fixes