Fixing Scrollbars

Fixes #22