Added display prefs. Minor cleanup.