refactor RightControlPanel more