added clipping & scroll adjustments