Merge pull request #49 from ijaz2020/dev

cart finishing
cart table changes