Fixes to settings page