Trying to fix scrolling issues