Improve table headers and invert inline