improve layout and add random position swapping