Cleanup demo
Fix scroll coordinates
Simplify tool controls movement