Scrollbar updates

Fixes #205
Fixes #347