Checkout - Improve UI part 2