Fixed ShopMarker, added MarkerFactory