Improved font handling