NXP-11929: Fix space issue between widgets