Updated checkout process and UI