ADDED. Functionality for edit in the same windows

ADDED. Functionality for edit in the same windows