improve layout move