Finally fixed layout, some more grammar fixes