Improve context display
Texts review