removed photo pins and made more modular