More typography changes and layout changes