margin and scrolling fixes