Shop page updated. Fixed #6 & fixed #3