Fixed stuttery layout update