Change menu text
Add better format for output