Shorten some texts to fit window
Merge remote-tracking branch 'upstream/master' into N2C4
white space