Improved checkout process and fixed some minor problem on the frontend