Added scroll listeners. Still not working correctly