Add collision detection and scrolling