Added fonts and cleaned up markup