[TIMOB-13243] Fix layout issues