Fix up header with border