Some more cleaning up in pref view, not done yet