Fixed scrolling performance issue