Fixed for amount format and Change the messages