Major improvements to grid and typography