Fix and modify alerts system as per DexX's feedback