Revert "ENYO-1883: Moved ok and cancel buttons at the bootom of the popup"

This reverts commit 3a72c3b0f41ca9122b5a3ea7ae1fad3355d25002.