Use the new changes for screenshots support
Scrolling tweaks