Some fixes to scroll-bar