Further one page checkout improvements and fixes