CON-2102 | Fix overlapping content

Why 30?
At least please add comment, but it's be better if we could read this number from layout.