Fixing and finish implementing gift cards