Added scroll transition option

Performance improvements