Add missing typograhy styles and move some stuff around