Fixed bug and working on shop section.