Refactored the fonts
Adding the fonts etc..