Refactoring, included fonts

Fixed Font not rendering
Refactoring