Fix up preferences handling so the screen shows current setting in summary