Fixing scroll issue