Fixed xml structure failure and added checkout block