Fixed small issues with scroll