Add content border more defensively