Adding Edit/Add
Revert "Adding Edit/Add"

This reverts commit 536eb32c1367c3631bab602483c705b2750e66f5.