Updated to match header element classes