merged the control and info panels