Header refactor with flag icons fix issue #13