Merge "Fix styles in header." into sc-dev