Typography

Merging typography branch
Also contains some grid changes