Reorganising Fonts module
Minor tweaks