Settings page fixes