Fix issue with scrollbars