added alerts, changed panels