Revert "Merge branch 'xmozolak/ui-fixes' into 'main'"

This reverts merge request !73
1 job for !74 with revert-21bd6f7f
latest merge request