Added collision detection and z-index tomfoolery when dragging items