Added scroll and cursor awareness