Improve typography some more