Settings activity improved