Scrollbar fix

Pull request for Scrollbar-fix