Addition Fixes to AlertPanel from Main