The labels for computers in the UI are very short (7 characters plus 3 dots). In corporate environments naming conventions may mean that computers are indistinguishable. I suggest the following improvements: Allow the user to enter a custom nickname of 10 characters. Display the full name in a pop-up when hovering over. Have different icons or colours for different operating systems and an indicator showing which is the current master.