There is some refactor and added link button to drag elements