Added marker scrollTo and popup template functionality