Improved viewing selection.