Mostly refactoring. Added new font.