Alert and Modal changes