Use new panel classes