More format fix

More format fixes to main menu, and agent discovery section