Component Viewer: feedback applied
Component Viewer: toggle issues