Optimise the grid columns for md and lg, and tweak the typography
Pre merge branches
Merge fixes