Continue removing any non-scoped selectors. Refs #595

Last hits will be combobox and layerswitcher.