Added movement and borders