Remove the "classic" word displayed in header bar
Merge branch 'fix-classic-word'