update checkout page
Merge origin/master