Fix: scroll bugs