Rename classes to avoid confusion, update what I have achieved with Alerts Tab