Changed the fonts and cleaned up