Grammar fixes to LayoutAndStyle