Merge "Cleaning up drag and drop visulization and drop location determination"