Now checks cell type before resetting it. Updated bounce back when dragging past the buttons.

Now checks cell type before resetting it. Updated bounce back when dragging past the buttons.