Fixes for screen resize and scroll