Added edit window with pre-fill