Added edit and delete features