Various fix
Simplify typography a bit