Improved UI for machines with a long name.