Fixed #8 #9 performance issue and upward scroll offset