Adjust layout
Fix move() function