EDDC-277 EDDC-297 Fixing issues related to the proper functionality of buttons on add and edit forms