Merge pull request #48 from ijaz2020/dev

cart table changes
cart finishing