toggle editable and drag and drop elements
toggle editable and drag and drop elemens. Merge conflicts resolved