Fixed checkout to make the process more intuitive