Fix cart table and added events