Add+Edit is now reduced to single step. For new users, it is easier to comprehend this single step and no text hint is needed for edit
For now we prompt user to click Apply, in future we can use this to do a "Auto Apply"
Fixes issue 144