Co-authored-by: HeshamTB <38921037+HeshamTB@users.noreply.github.com>
some rework in the GUI interface