alert message changed for end users for production
change UI for all screen on r2_index
change the alert message on prodcution
resolved merge conflicts