Bugfixes

Messed up the scrolling again, should be fixed now.