Fixed word-wrap issues