Issue #1490402 followup by sun: Redesign tabs and the content header.