Scrollable workaround improvements