Some fixes for scrolling on resize

Does not resolve all issues yet