Better line breaks and further menu text improvements