Clean up header markup and scss