Added fixes for scrolling. We are deviating a bit from the original now.