Refactor and fix draggable contacts to move to completed and contacted status