Adding edit & remove