CON-2102 | Fix overlapping content