Updates to Droppable Functionality

Updates to Droppable Functionality