changes to new drag and drop
fixed merge conflicts between frontEnd branch and controller_features branch