fixes to layout and scrolling