Make tables obey typographic baseline, reorganize