More work on master selection dialog