Updates

frmControlPanel and classes