Fixing scrolling issue