moved creation of popups
resolved conflicts
fixed actionevents for DragAndDropController