adding edit buttons for modal
fixed merge changes