Visual tweaks plus some changes for NsdDiscovery