Manually merged the dragging and dropping code with the renaming code