Edit Window functions

minus save btn/edit window is working correctly