Improve automatic layout updates