Handle proportional fonts a bit better

Not perfect, just a bit better :).