More work for 2-row header in notebook UI.