Optimization and scrolling issue solved