Display optimization

Changes some pharases for better displaying
Merge branch 'Fixes/Screen-Issues-002'