More grammar and layout fixes