Updated fonts and lay-out