Updating with more responsiveness on layout