Scroll and DOM bug fixes