Remove padding directives and place header in a container