fixed issues after refactor for ControlView