Added dragging and updated the grid buttons