Various layout / scrolling fixes.