Bug 856073 - Enforce header widths