Various updates to settings page