Grammer and layout fixes