Further tweaks to typography and the base template