Fonts and little refactoring