Tidy up
Consolidate header row elements, flexbox