fixes issues on 2.1: margins, and scrolling cache