Add separator
minor refuct
Add country to decorator population
Minor fix
Add user address population
Add user country in address
Add some logick for currency