Checkout: Improve UI Part 1