Improve typography and table