reorder display settings
Clean cr_strings a bit

Conflicts:
	res/values/cr_strings.xml