Rename classes to avoid confusion, update what I have achieved with Alerts Tab
minor changes, moving to master
Merging my code with master