first stab at fixing scrolling on large windows
fixing up merge conflicts