Changes to support a status panel