fixing scroll bugs
fixing scroll bugs