change to international version and make some layout adjustment