Rework scrollbar markup

Simplifies a bunch of calculations
Also updated sample code