Additional work to improve layout resizing