Minor UI improvements

Improved text wrapping for some displays