Fixed scrollbars issue #25