settings page bug fixes