completed fixes to settings page