Fixed weird paging/scrolling issues