Added fonts and fixed Grid