CComponentsHeader: Fix positioning of items
Merge remote-tracking branch 'cool-next-cc/next-cc'