Add Create and Edit Popup, remove drag an drop in Directive