[TIMOB-13243] Fix Layout issue