Grammar and layout fixes