Updated for font issue and styling