move again bug fixed
improve layout