Added badges
Added generic alerts