Added support for horizontal scrollbars