Words fixed
Layout changed
Improvements