Added Edit_OnClick(), fixed issues MAGN4505
Updated as feedback
updated as feedback
Merge pull request #2510 from theanh0512/MAGN4505

Added Edit_OnClick(), fixed issues MAGN4505