Update pg version
Cleaning: replace erb with haml
Improve display words source