Fixing scroll issues