Fixed shop page loading issues
Merge pull request #18 from jonnyli1125/master

Fixed shop page loading issues