More progress on main table headers