diff --git a/web/ui/assets_vfsdata.go b/web/ui/assets_vfsdata.go
index 05dc2b3af..88faa6de6 100644
--- a/web/ui/assets_vfsdata.go
+++ b/web/ui/assets_vfsdata.go
@@ -668,9 +668,9 @@ var Assets = func() http.FileSystem {
 		"/templates/service-discovery.html": &vfsgen۰CompressedFileInfo{
 			name:             "service-discovery.html",
 			modTime:          time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC),
-			uncompressedSize: 2755,
+			uncompressedSize: 2582,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x56\x41\xcb\xe3\x36\x10\xbd\xfb\x57\x0c\x6a\x0e\x6d\xd9\xc4\xfb\x2d\xb4\x87\x54\x71\x29\xec\xa5\xd0\x42\xa1\x4b\x2f\xa5\x14\xd9\x9a\xc4\x93\x55\x64\x23\x29\xd9\x04\xe1\xff\x5e\x24\xd9\x8e\x92\x26\x5b\xfa\xf5\xda\x40\x82\x34\x92\x66\xde\xbc\x79\x23\xc5\x7b\x89\x5b\xd2\x08\xac\x45\x21\xd9\x30\x14\x5c\x91\xfe\x08\xee\xd2\xe3\x86\x39\x3c\xbb\xb2\xb1\x96\x81\x41\xb5\x61\xd6\x5d\x14\xda\x16\xd1\x31\x68\x0d\x6e\x37\xcc\x7b\xe8\x85\x6b\x7f\x31\xb8\xa5\x33\x0c\x43\x69\x9d\x70\xd4\x84\x33\xa5\x13\x66\x87\xce\xae\x1a\x6b\xbf\x3f\x6d\xbc\x87\xfa\x48\x4a\xfe\x86\xc6\x52\xa7\x61\x18\x58\x55\x70\xdb\x18\xea\x1d\x58\xd3\x3c\xf7\xb5\xbf\xba\xda\x3f\xf3\xc4\xcb\xe4\xa9\x2a\xbc\x47\x2d\x87\xa1\x28\x78\x44\x5b\x15\x00\x5f\xff\x4e\xf2\x8f\x75\x8d\xdb\xce\x20\xf8\x02\x00\x40\x92\xed\x95\xb8\xac\xa1\x56\x5d\xf3\xf1\xbb\x68\x6b\x3a\xed\x50\xbb\x35\x30\x60\xc9\x72\x10\x66\x47\x7a\xe9\xba\x7e\x0d\xcb\x6f\xbf\xe9\xcf\xc9\xdc\x22\xed\x5a\xb7\x86\xab\xe5\x44\x96\x6a\x52\xe4\x2e\x6b\x68\x49\x4a\xd4\xc1\x3e\x14\xbc\x1c\x41\x14\x57\x9e\xc7\x30\x81\x6a\x00\x2e\xe9\x04\x8d\x12\xd6\x6e\xe2\x82\x20\x8d\x66\xb9\x55\x47\x92\xac\x2a\xa2\x6f\xde\xbe\x54\xbf\xa2\x39\x51\x83\xf0\x9e\x6c\xd3\x9d\xd0\x5c\x78\xd9\xbe\x54\x69\x59\xd2\x29\x8d\x00\xf8\x51\x4d\x43\x00\xef\x8d\xd0\x3b\x84\x05\xbd\x81\xc5\xbe\xab\x61\xbd\x81\xd5\x8f\x5a\xe2\x39\x46\x9e\x3e\x5c\x51\x95\x4d\x01\xb8\x18\x6b\xfb\xc5\xbe\xab\x97\xde\x87\xb3\x81\xe2\x69\xc4\x4b\x51\xc1\x97\xde\x03\x05\x5f\xb0\x58\xfd\xd0\x38\x3a\x85\x38\xa1\x66\x99\xfd\x43\xe7\x84\x4a\x66\x10\x69\xcf\x58\xc7\xaf\xf2\xf8\x65\x0e\x60\xaa\xde\xb4\x36\x25\xc4\xcb\x98\x66\x91\xf6\x2c\x46\x3f\x31\xa5\x0f\x69\x3c\x1e\xfa\x6c\xd6\x33\x61\x13\xe5\x4e\xd4\x0a\x97\x33\xf1\x6c\x26\xb2\x7d\x37\x6d\xd9\x77\xf5\x9f\xa1\x35\xd0\x30\x20\x19\xe7\x19\x29\x19\xf0\x64\x9a\x0d\xbc\x3e\x3a\xd7\xe9\xb1\x91\xd2\x84\x5d\xe3\x26\xfc\x4d\xa7\x94\xe8\x2d\xca\x65\x44\x02\xb5\xd3\xe1\xbb\xec\x0d\x1d\x84\xb9\xb0\xca\xb6\xdd\x27\x38\x74\x06\x79\x99\x5c\xcc\x08\xcb\xf6\xdd\x34\xf6\xfe\x13\xb9\x76\xe6\xfd\xbd\xe9\xfa\x1e\x25\x2c\x68\x86\xe3\x3d\x6d\x61\xe7\x60\x05\x2f\x6f\xdf\xc2\x95\xdf\x1b\xf5\x4d\x50\x50\xe1\x21\x08\x14\xa2\x76\x37\x6c\xea\x15\xdd\x69\xbc\xc9\x18\x56\xa1\xb4\x53\x2e\xad\x38\x21\xd4\x88\x1a\x64\x02\xf0\x06\x02\x7a\xd2\x3b\xe8\xb4\xba\x80\x6b\x11\xb6\x64\xac\x8b\x18\xc6\x3d\xf3\x69\x61\x01\xcf\xe2\xd0\x2b\xb4\xab\x39\xc5\x4c\xda\xb7\xc2\xb8\x93\x49\x22\x2f\xaf\x29\xa4\xca\xda\xc3\x38\xa8\x3b\x23\xd1\xc4\x78\xd1\xee\x0c\xf5\xf3\xac\x0d\x2d\xf5\x4f\xe9\x72\x17\x54\x90\xab\x42\xa2\x13\xa4\x2c\xcb\xdb\x87\x3b\x73\xd7\x4d\xae\xad\xa6\xae\x45\x09\x3f\x89\x1a\x95\xe5\xa5\x6b\xff\xbe\x2d\x09\xf9\xc9\x16\x5e\xe6\x9e\xc3\x2a\x0a\x99\xa3\xab\x3b\x79\x19\x1b\x24\xef\x83\x51\x14\x13\xcd\x77\x22\x7d\x08\x78\x4e\x52\x45\x24\xec\x76\x7d\x14\x7b\x5a\x8b\xdd\x75\x4d\x2f\x41\x5f\xfd\x2c\x7a\xb8\x09\x32\x7a\x3e\xaa\xd9\x33\x59\xb7\x24\xad\x48\xe3\xcc\x7b\xb4\xc5\xf1\x32\xf4\xcc\x3d\xff\x79\xf4\xb1\xc5\x23\x86\x37\xb0\x38\x09\x75\xc4\x00\x65\x44\xf5\x20\x36\x3c\xba\xe9\xb2\x25\xdb\x0b\x3d\x81\xab\x85\xdc\x21\xc4\xdf\x6b\x23\x4e\x29\x0f\x43\x78\xa8\x52\xc8\x61\x60\xbc\x0c\x27\x1f\xbb\xbd\xbd\xd9\x72\xfc\xa8\x2c\x3e\x04\xf9\x14\xe2\x53\x80\x12\xb7\xe2\xa8\x1c\xab\x02\x5d\xcf\xd1\x7c\x06\x4b\xd6\x48\xf9\xfe\xfc\x29\x49\x16\x27\xff\xab\x52\xfe\xd7\xc7\x2d\xa3\xff\x5a\x1f\xaf\x03\x39\x6b\x64\x7c\x19\x5e\x09\xea\x95\x42\xb9\xbd\xb9\xee\xfd\xf0\x72\xbc\xb9\xe6\x69\xb8\x92\x6f\x1e\xfd\x74\x0c\x50\xcb\xa4\x9a\xe9\xbf\xc0\xe4\xea\xaf\x00\x00\x00\xff\xff\xd4\xc9\x8d\xfa\xc3\x0a\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x56\x51\x8b\xe3\x36\x10\x7e\xf7\xaf\x18\xd4\x3c\xb4\x65\x1d\xdf\x1e\xb4\x0f\xa9\xe2\x52\xb8\x97\x42\x0b\x85\x1e\x7d\x29\xa5\xc8\xd6\x24\x9e\x9c\x22\x19\x49\xf1\x25\x18\xff\xf7\x22\xc9\x76\xec\xdb\xdd\xb6\x74\xe9\xdb\x2d\xec\x22\x8d\x46\x33\x9f\xbe\x6f\x66\xbc\x7d\x2f\xf1\x40\x1a\x81\x35\x28\x24\x1b\x86\x8c\x2b\xd2\x1f\xc0\xdf\x5a\xdc\x33\x8f\x57\x5f\xd4\xce\x31\xb0\xa8\xf6\xcc\xf9\x9b\x42\xd7\x20\x7a\x06\x8d\xc5\xc3\x9e\xf5\x3d\xb4\xc2\x37\xbf\x58\x3c\xd0\x15\x86\xa1\x70\x5e\x78\xaa\xc3\x9d\xc2\x0b\x7b\x44\xef\xb6\xb5\x73\xdf\x77\xfb\xbe\x87\xea\x42\x4a\xfe\x86\xd6\x91\xd1\x30\x0c\xac\xcc\xb8\xab\x2d\xb5\x1e\x9c\xad\x5f\x8e\x75\xba\x87\x3a\xbd\x14\x89\x17\x29\x52\x99\x65\x3c\xa2\x2c\x33\x80\xaf\x7f\x27\xf9\xc7\xae\xc2\x83\xb1\x08\x7d\x06\x00\x20\xc9\xb5\x4a\xdc\x76\x50\x29\x53\x7f\xf8\x2e\xda\x6a\xa3\x3d\x6a\xbf\x03\x06\x2c\x59\xce\xc2\x1e\x49\xe7\xde\xb4\x3b\xc8\xbf\xfd\xa6\xbd\x26\x73\x83\x74\x6c\xfc\x0e\xee\x96\x8e\x1c\x55\xa4\xc8\xdf\x76\xd0\x90\x94\xa8\x83\x7d\xc8\x78\x31\x82\xe8\x7b\xd4\x72\x18\xb2\xec\xce\xf3\x98\x2e\x50\x0d\xc0\x25\x75\x50\x2b\xe1\xdc\x3e\x1e\x08\xd2\x68\xf3\x83\xba\x90\x64\x65\x16\x73\xf0\xe6\xb1\xfc\x15\x6d\x47\x35\xc2\x3b\x72\xb5\xe9\xd0\xde\x78\xd1\x3c\x96\xe9\x58\x52\x97\x56\x00\xfc\xa2\xa6\x25\x40\xdf\xe7\x60\x85\x3e\x22\x6c\xe8\x01\x36\x27\x53\xc1\x6e\x0f\xdb\x1f\xb5\xc4\x6b\xcc\x3d\xfd\x70\x45\x25\x17\xa3\xa0\x5f\x9c\x4c\x95\xf7\x7d\x70\x0f\xbc\x4e\x2b\x5e\x88\x12\xbe\xec\x7b\xa0\x70\x1d\x36\xdb\x1f\x6a\x4f\x5d\x08\x1d\x84\x5a\xd8\xdf\x1b\x2f\x54\x32\x83\x48\x3e\xa3\x78\x5f\xf1\x42\xd1\x1a\x5e\xe2\x66\x44\x51\x4c\xe0\x79\x11\x9f\x94\x4d\x5e\x9b\x31\x40\x84\xff\x3e\xad\xc7\x6b\xff\xf0\xc6\x99\xa0\x89\x62\x2f\x2a\x85\xf9\x4c\x34\x9b\x89\x6b\xde\x4e\x2e\x27\x53\xfd\x19\x5a\x01\x2d\x03\x92\x71\xbf\xe0\x63\x01\x3f\x99\x80\x57\x17\xef\x8d\x1e\x1b\x26\x6d\xd8\x3d\x5f\x42\x5e\x1b\xa5\x44\xeb\x50\xe6\x11\x01\x54\x5e\x87\xdf\xbc\xb5\x74\x16\xf6\xc6\x4a\xd7\x98\x8f\x70\x36\x16\x79\x91\x42\xcc\xc8\x8a\xe6\xed\xb4\x0e\xaf\xfd\x48\xbe\x99\xc9\x7e\x67\x4d\xdb\xa2\x84\x0d\xcd\x34\x06\x1f\x3a\xc0\xd1\xc3\x16\x1e\xdf\xbc\x81\x3b\xbf\xab\x4a\x9b\xe0\xa0\xc2\x73\x28\x46\x88\xf5\xba\x67\x53\x7f\x68\xa3\x31\xa8\x0f\xdb\x20\xe4\xf4\x8c\x46\x74\x08\x15\xa2\x06\x99\x32\x3f\x40\x00\x4e\xfa\x08\x46\xab\x1b\xf8\x06\xe1\x40\xd6\xf9\x98\x7a\xf4\x99\x6f\x0b\x07\x78\x15\xe7\x56\xa1\xdb\x8e\x1a\x3f\x5f\x0a\x4f\x4a\x23\x91\xb6\xd4\x10\x92\x92\xee\x3c\x2e\x2a\x63\x25\xda\x98\x2c\xda\xbd\xa5\x76\xde\x35\xa1\x65\x5e\x78\xe2\x2c\x28\xf7\x41\xf5\x65\x15\x48\xf4\x82\x94\x5b\xf8\x04\x2f\xbb\xdc\xc6\x6b\xe5\xd4\x95\x28\xe1\x27\x51\xa1\x72\xbc\xf0\xcd\x53\xb7\x54\xba\x2f\xb8\xf0\x62\x19\x39\x9c\xa2\x90\x4b\x74\x95\x91\xb7\xb1\x29\xd6\x95\x3f\x16\xc3\xc4\x72\x2a\xcb\xbf\x87\x3c\x3f\x53\x45\x2c\x6c\x7d\x3e\xf7\x5d\x3a\x8d\x1d\x75\x7f\x62\x82\xbf\xfd\x59\xb4\xb0\x4a\x33\xc6\xbe\xa8\x39\x36\x39\x9f\x93\x56\xa4\x71\xe6\x3e\xda\xe2\x3a\x0f\xfd\xf2\xa9\x06\xeb\xfc\x63\x63\x47\x14\x0f\xb0\xe9\x84\xba\x60\x00\x33\xe1\x7a\x26\x3d\x4c\xe3\xcc\xb5\x42\x4f\x40\x2a\x21\x8f\x08\xf1\xef\xbd\xe1\xfa\x3e\x85\x19\x86\xf0\xe1\x49\xc1\x87\x81\xf1\x22\xdc\x2c\xd7\xa3\x6a\x0d\x0b\x95\x43\xc8\xff\x4b\x72\x89\x07\x71\x51\x9e\x95\xe1\xd9\xff\x26\x93\x96\xcf\x72\x5c\x2c\xc7\x7c\xb2\x78\xf9\x7a\x8d\x3f\x2b\xfb\x7a\x65\xc7\x89\xfc\x7f\x8a\xbb\x9e\x14\x9f\xce\xca\x78\x9e\x66\xc5\xbc\x0d\x43\x70\xf5\x69\x7d\x82\x61\xfa\xe4\x4e\xff\xae\xfc\x15\x00\x00\xff\xff\xfc\xa4\x3a\xad\x16\x0a\x00\x00"),
 		},
 		"/templates/status.html": &vfsgen۰CompressedFileInfo{
 			name:             "status.html",
@@ -682,9 +682,9 @@ var Assets = func() http.FileSystem {
 		"/templates/targets.html": &vfsgen۰CompressedFileInfo{
 			name:             "targets.html",
 			modTime:          time.Date(1970, 1, 1, 0, 0, 1, 0, time.UTC),
-			uncompressedSize: 3209,
+			uncompressedSize: 3097,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x56\x4b\x8f\xe4\x34\x10\xbe\xf7\xaf\x28\x85\x16\x02\x69\xd3\xd1\xee\x71\x49\x07\x01\xbb\xd2\x22\x0d\x68\xd8\xd9\xe1\xc0\x65\xe5\xc4\xd5\x1d\xcf\xb8\xed\x60\x57\x9a\x69\x32\xfe\xef\xc8\x76\x5e\xd3\x8f\x81\x41\x82\x4b\xe4\xb2\xeb\xf9\xf9\x73\x55\xba\x8e\xe3\x46\x28\x84\xa4\x46\xc6\x13\xe7\x16\xb9\x14\xea\x1e\xe8\xd0\xe0\x3a\x21\x7c\xa0\xac\xb2\x36\x01\x83\x72\x9d\x58\x3a\x48\xb4\x35\x22\x25\x50\x1b\xdc\xac\x93\xae\x83\x86\x51\x7d\x6d\x70\x23\x1e\xc0\xb9\xcc\x12\x23\x51\x79\x9b\x8c\x98\xd9\x22\xd9\x55\x65\xed\xb7\xfb\x75\xd7\x41\xd9\x0a\xc9\x7f\x45\x63\x85\x56\xe0\x5c\x52\x2c\x72\x5b\x19\xd1\x10\x58\x53\x5d\xf6\x75\x37\xb9\xba\xbb\xe4\x29\xcf\xa2\xa7\x62\xd1\x75\xa8\xb8\x73\x8b\xc5\x62\x2a\xad\xd2\x8a\x50\x91\xaf\x0e\x20\xe7\x62\x0f\x95\x64\xd6\xae\xc3\x01\x13\x0a\x4d\xba\x91\xad\xe0\x49\xb1\x00\x00\xc8\xeb\xd7\xc5\xa7\x18\x31\xcf\xea\xd7\xfd\xa6\x37\x13\x7c\x9d\xd8\x5a\xff\xd1\x9f\x26\x83\x9f\x92\x54\xba\x35\xba\x6d\x60\x5c\xa5\xa4\xb7\x5b\x89\x09\x70\x46\xac\x17\xd6\x49\xd9\x12\x69\x65\xfb\x40\x00\xb9\x64\x25\xca\x99\x9b\xe0\xa0\x31\x62\xc7\xcc\x61\xd4\x02\xc8\x85\x6a\x5a\xea\x6f\xc5\x30\x2e\x74\x02\x8a\xed\xfc\x15\x0d\xa9\xf8\xdc\x98\x94\xe9\xb8\xc1\x5a\xd2\x95\xde\x35\x12\x09\xd7\x89\xde\x6c\x12\xa8\x6a\xac\xee\x91\x17\xf0\x9d\x94\x43\x06\x59\x48\xe1\x3f\x4a\xa8\x55\x35\x32\x49\xf5\xe1\xb9\xb4\x0a\xb8\x1d\xd4\x2e\x24\x95\x95\xc6\xaf\xf3\x8c\x8b\x7d\xb1\x08\xbb\x5d\x67\x98\xda\x22\x2c\xef\x74\xf9\x0a\x96\x8d\xd6\x12\xde\xae\x61\x15\xaf\xe6\x5a\x6b\x69\xc3\x75\x7b\xcd\x65\xef\xdd\x2b\xa8\x76\xf7\xa1\x97\x82\xd1\xa4\x44\x9a\x58\xf0\x21\x51\x8d\x67\xd3\xdd\xf7\x90\x10\x2b\x25\xa6\x23\x71\xa6\x9b\xac\xdf\x0c\x2a\x77\xba\xfc\xec\x5f\x13\x9a\xae\x13\x1b\x90\x04\x63\x02\x31\x88\x73\xc0\x7d\xf2\xa6\x27\xeb\x1c\x57\x16\x70\xbb\xd3\x65\xda\x75\xbe\x36\xe7\x86\xb7\xf6\xc5\x93\xcd\x62\x58\xc1\x57\x53\x81\xce\x65\x43\x21\xce\x41\xdb\x7c\x9d\x67\x6c\xe6\x3b\xb2\xaf\xbf\xb4\x28\x24\x53\x5d\xe1\x7e\x00\x1f\x1a\xa6\x38\xf2\x34\x14\x0a\x27\x0c\xf0\xf4\x07\x89\xd6\xe6\x59\xf4\x30\x5d\x52\xfd\x66\x5c\x47\xe3\x39\x64\x10\x81\xb3\xbb\x7e\x51\x6a\xc3\xd1\x20\x1f\xf6\xc9\x88\x66\x94\x6a\xbd\x9f\x41\xeb\xfd\x79\x3c\xe7\xf8\x72\x24\x26\xa4\x9d\xe9\x78\x2d\x33\x17\x83\x59\xf1\x5e\xf1\x46\x0b\x45\x79\x46\xf5\xe9\xe9\x0d\x31\xc2\xf3\x47\x57\x9e\x81\xf6\xd2\x99\x25\xb8\xa9\x0c\x6b\x2e\x18\xc7\x33\x78\xd7\x1a\x46\x42\xab\xf3\x4a\xef\x8d\xd1\xe6\xf8\x28\xcf\xe6\x55\xf8\x53\x64\x7c\x8e\x44\xa9\xf9\x61\x92\xc7\x67\x30\xe3\xf2\x45\x34\x46\x04\xb1\x07\x25\x79\xaa\x11\xe8\x37\x34\xf6\xd5\xed\xc7\x2b\x78\x84\xad\xd4\x25\x93\xb7\x1f\xaf\x22\xe7\xfc\xee\xea\xa6\xaa\x71\x87\xce\xbd\xcd\xb2\x7e\xe7\x83\xb6\xe4\x5c\x2f\x5c\x33\xaa\x9d\xf3\xd4\xcb\x4b\x73\x1c\x61\x4c\x38\xbc\xf0\x57\xb0\xdc\x33\xd9\xa2\x0d\x6f\xd7\x1b\xff\xd2\xa2\x39\xc0\x93\x4a\x8e\x0c\xc5\x60\xe4\x6d\x7a\xf3\x33\xfa\x00\xb9\x6d\x98\x1a\x5b\x19\xe3\x5b\x84\xf0\x9d\xc8\xdc\x75\x31\x0d\xe7\x7c\xc5\xd1\x97\x73\x49\x9e\x79\xcb\xe3\xcc\x7d\x0a\x71\xb6\xfc\xfd\x6e\x9e\x11\xbf\x88\xbe\x9f\x6b\x78\x0a\xfd\x3c\x5b\x26\xd1\x10\x84\x6f\xda\x75\xb0\x8a\x2d\x0b\x1e\x21\x3e\xd3\x28\x7e\xd2\x3f\x78\x6d\x70\x0e\x82\xcb\xcf\x42\x71\x51\x31\xd2\x06\xfc\xe0\x4e\xdb\xa6\x41\x53\x31\x7b\x1a\xcb\x27\xdd\xfb\x3c\x29\xe7\x5c\xf1\xcf\x96\x13\x10\xb4\xcf\xd7\x53\xb5\xc6\x6a\x93\x06\xd2\xa1\x39\x1a\x8a\xa4\xb5\x24\xd1\x24\x40\x82\xbc\xdc\x1f\xd7\xb4\x93\x6b\x32\x2d\x46\x51\x1b\xb1\x15\x8a\xc9\xb4\xd7\xca\xcb\xe2\x7b\xdc\x68\x83\xfe\xdf\xc4\xa7\x20\xd4\xf6\x6d\x9e\x95\xc5\x48\x94\x7b\x4f\x94\x40\xac\x77\xc2\x56\xbe\xa5\x20\x8f\xaf\x7a\xf5\x13\x6b\x9c\xf3\xec\xec\xba\x25\xee\x23\x91\xe0\x11\x7c\x48\x4f\xe3\xe5\xbd\x73\xeb\x2f\x7f\x6f\x35\x7d\x13\x14\x9c\x1b\x84\xe3\x7e\x3d\xe1\x79\x8e\xd6\x21\xf8\x3c\xe4\xff\xc4\x52\x69\xf1\x65\xb1\x38\x6e\x58\x2b\x29\x29\x94\x56\xf8\x32\xfa\xff\x0b\xbe\x58\x4a\x6d\x68\x90\x27\x40\x86\x81\xb9\xf2\xed\x35\x76\xd0\xd5\x8f\xf6\x37\x34\xda\xb9\x9f\x71\x1f\xc6\x65\xa8\xac\xeb\xac\x50\x15\xce\x15\x9d\x03\xb6\xd5\x2f\x7f\x8a\xc1\x38\xe5\x7d\x9f\x3e\x93\x4f\xdd\xee\x98\x12\x7f\xe2\xd0\xca\xe7\x41\x87\xbd\xd5\x0d\x56\x5a\xf1\xe3\x2e\xf4\x6c\x64\xf4\xcd\xff\xf4\xd5\x4c\x00\x84\xe9\x70\x8a\xf6\xa5\x2e\x11\x7f\x28\x8e\x1b\x41\x68\xd9\x33\x6f\xe7\xaf\xf6\x9f\xc0\xf6\x74\x2e\x1d\x5b\xe4\xd9\x93\xb9\x94\x67\x61\x8e\xf7\x7f\xce\xf1\xaf\x2d\x9a\x01\x2a\x1e\xbb\x7b\xbf\x3d\x78\xfa\x2b\x00\x00\xff\xff\x93\xc0\xac\xfd\x89\x0c\x00\x00"),
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x56\x5d\x6f\xdb\x36\x17\xbe\xf7\xaf\x38\xd0\x6b\xbc\xd8\x80\xca\x42\x7b\x99\xc9\x1a\xb6\xb5\x40\x07\x64\x43\xd6\x34\xbb\xd8\x4d\x41\x89\xc7\x16\x13\x9a\xd4\xc8\x23\x2f\x1e\xc3\xff\x3e\x90\x94\x6c\xd9\x8e\xd3\x75\xc0\x76\x63\xf8\x7c\x7f\x3d\xe7\x50\xce\x71\x5c\x09\x85\x90\xb5\xc8\x78\xe6\xfd\xac\x94\x42\x3d\x00\xed\x3a\x5c\x66\x84\x8f\x54\x34\xd6\x66\x60\x50\x2e\x33\x4b\x3b\x89\xb6\x45\xa4\x0c\x5a\x83\xab\x65\xe6\x1c\x74\x8c\xda\x1b\x83\x2b\xf1\x08\xde\x17\x96\x18\x89\x26\xd8\x14\xc4\xcc\x1a\xc9\x2e\x1a\x6b\xbf\xdd\x2e\x9d\x83\xba\x17\x92\xff\x8a\xc6\x0a\xad\xc0\xfb\xac\x9a\x95\xb6\x31\xa2\x23\xb0\xa6\xb9\xec\xeb\xfe\xe0\xea\xfe\x92\xa7\xb2\x48\x9e\xaa\x99\x73\xa8\xb8\xf7\xb3\xd9\xec\x50\x5a\xa3\x15\xa1\xa2\x50\x1d\x40\xc9\xc5\x16\x1a\xc9\xac\x5d\x46\x01\x13\x0a\x4d\xbe\x92\xbd\xe0\x59\x35\x03\x00\x28\xdb\xd7\xd5\xc7\x14\xb1\x2c\xda\xd7\x03\x33\x98\x09\xbe\xcc\x6c\xab\xff\x18\xa4\xd9\xe8\xa7\x26\x95\xaf\x8d\xee\x3b\xd8\xff\xcb\x49\xaf\xd7\x12\x33\xe0\x8c\xd8\x40\x2c\xb3\xba\x27\xd2\xca\x0e\x81\x00\x4a\xc9\x6a\x94\x13\x37\xd1\x41\x67\xc4\x86\x99\xdd\x5e\x0b\xa0\x14\xaa\xeb\x69\x98\x8a\x61\x5c\xe8\x0c\x14\xdb\x84\x11\x8d\xa9\x84\xdc\x98\x94\xf9\x9e\xc1\x7a\xd2\x8d\xde\x74\x12\x09\x97\x99\x5e\xad\x32\x68\x5a\x6c\x1e\x90\x57\xf0\x9d\x94\x63\x06\x45\x4c\xe1\x5f\x4a\xa8\x57\x2d\x32\x49\xed\xee\xa5\xb4\x2a\xb8\x1b\xd5\x2e\x24\x55\x1b\x28\x02\x51\x16\x5c\x6c\xab\x59\x64\x3b\x97\x83\x61\x6a\x8d\x30\xbf\xd7\xf5\x2b\x98\x77\x5a\x4b\xb8\x5a\xc2\x22\x4d\xe7\x46\x6b\x69\xe3\xc4\x93\xee\x7c\x08\x11\x54\x54\xbf\x79\x3f\x50\xd1\x6c\xaa\x46\x9a\x58\xf4\x23\x51\xed\xa5\x07\x08\x0c\x9d\x21\x56\x4b\xcc\xf7\xf8\x39\x0c\xb4\x7d\x33\xaa\xdc\xeb\xfa\x53\x58\x2a\x34\xce\x89\x15\x48\x3a\xa4\x90\x82\x78\x0f\x3c\x14\x60\x06\xcc\x4e\xdb\xcb\x62\xfb\xee\x75\x9d\x3b\x17\xea\xf3\x7e\x5c\xb9\xff\x1d\x31\xab\xf1\x1f\x7c\xe5\xdc\xe8\xdf\xfb\xc2\xb9\x7d\x8c\xbe\xfb\xba\x2c\xd8\xc4\x77\x02\xe1\x30\xbb\x44\x64\x87\xba\xe2\x98\x00\x1f\x3b\xa6\x38\xf2\x3c\x16\x0a\x67\x40\x08\x5b\x00\x12\xad\x2d\x8b\xe4\x61\xdf\x80\xa2\x7d\xb3\xff\x9f\x8c\xa7\x2d\x83\xd4\x38\xbb\x19\xfe\xd4\xda\x70\x34\xc8\x47\x3e\x19\xd1\xed\xa9\x56\x6f\x27\xad\x0d\xfe\x42\x3f\xa7\xfd\xe5\x48\x4c\x48\x3b\xd1\x09\x5a\x66\x4a\x46\xb3\xea\x9d\xe2\x9d\x16\x8a\xca\x82\xda\x73\xe9\x2d\x31\xc2\xe7\x45\xd7\x01\x88\xf6\x92\xcc\x12\xdc\x36\x86\x75\x17\x8c\x93\x0c\xde\xf6\x86\x91\xd0\xea\x79\xa5\x77\xc6\x68\x73\x2a\x2a\x8b\x69\x15\x41\x8a\x8c\x4f\x3b\x51\x6b\xbe\x3b\xd0\x93\x65\x98\xe0\xf9\x62\x3f\xf6\x3d\xc4\xa1\x2d\xd9\xb1\x46\x04\xe0\x78\xe1\x17\x77\x1f\xae\xe1\x09\xd6\x52\xd7\x4c\xde\x7d\xb8\x4e\xa8\x0b\xdc\xc5\x6d\xd3\xe2\x06\xbd\xbf\x2a\x8a\x81\xf3\x5e\x5b\xf2\x7e\x20\x6e\x18\xb5\xde\x07\xf0\x95\xb5\x39\x8d\x30\x49\x39\x2e\xfb\x2b\x98\x6f\x99\xec\xd1\xc6\x1d\x0e\xe6\xbf\xf4\x68\x76\x70\x54\xcb\x99\xa9\x18\xcd\x82\xd5\xe0\xe0\x19\x0b\x80\xd2\x76\x4c\xed\xef\x1a\xe3\x6b\x84\xf8\x7b\x80\xb4\x73\x29\x11\xef\x43\xd5\xc9\x97\xf7\x59\x59\x04\xcb\xd3\xec\x53\x12\xe9\xa9\xf9\x3b\xfc\xb2\x20\x7e\x71\x0a\xe1\xa1\xc3\xf3\x11\x4c\x33\x66\x12\x0d\x41\xfc\xcd\x9d\x83\x45\x3a\x5f\xf0\x04\x69\x61\x13\xf9\x51\xff\x10\xb4\xc1\x7b\x88\x2e\x3f\x09\xc5\x45\xc3\x48\x1b\x08\x2f\x79\xde\x77\x1d\x9a\x86\x59\x8c\x03\x4c\x36\x61\x3e\xe7\x05\xbe\x98\x6e\xec\x92\x7d\x39\xdf\xa6\x37\x56\x9b\x3c\x82\x0b\xcd\xc9\x2b\x48\x5a\x4b\x12\x5d\x06\x24\x28\xd0\x83\xb8\xa5\x8d\x5c\x92\xe9\x31\x91\xda\x88\xb5\x50\x4c\xe6\x83\x56\x59\x57\xdf\xe3\x4a\x1b\x0c\x1f\x23\x21\x05\xa1\xd6\x57\x65\x51\x57\xce\x0d\x60\x78\x08\x60\x88\xf0\x79\x2b\x6c\x13\x8e\x07\xf2\xb4\xbf\x8b\x9f\x58\xe7\x7d\x40\xa1\x73\x73\xdc\x26\xb0\xc0\x13\x84\x90\x01\xae\xf3\x07\xef\x97\xff\xff\xbd\xd7\xf4\x4d\x54\xf0\x7e\x24\x4e\x2f\xf3\xe7\xe0\x1b\xc3\x4f\x83\xfe\x67\x58\x94\x16\x21\xff\xb2\x78\x1c\x57\xac\x97\x94\x55\x4a\x2b\xfc\x52\xa0\xff\x03\xdc\x58\xca\x6d\x3c\x89\xa1\xc2\x1c\xc4\x2a\xb4\xca\x52\x3a\x93\x8b\x1f\xed\x6f\x68\xb4\xf7\x3f\xe3\x36\xbe\x89\xd2\x62\x98\x8d\x15\xaa\xc1\xa9\xa2\xf7\xc0\xd6\x7a\x18\xcd\xcb\x8b\x15\xf5\x73\x3e\xdc\xdf\x14\xb5\xed\x37\x4c\x89\x3f\x71\xbc\xca\x53\xd7\x23\x6f\x71\x8b\x8d\x56\xdc\x7e\xc6\x3f\x86\xd3\x6d\x8f\x8b\x89\xe7\xdc\xfb\x8b\xdb\x9b\x9e\xfc\xd3\x05\x8d\x1b\x39\x35\x4f\xcd\xbd\x50\xe4\xf1\xeb\x70\x3e\xa0\xb2\x38\x7a\x1f\xca\x22\xbe\xa7\xc3\x87\x6c\xfa\x86\x9a\x18\xa6\x13\x3b\xf0\xc7\xef\xe7\xbf\x02\x00\x00\xff\xff\x7d\xd6\x19\xcd\x19\x0c\x00\x00"),
 		},
 	}
 	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/web/ui/templates/service-discovery.html b/web/ui/templates/service-discovery.html
index 88e0f8a67..70292ddbf 100644
--- a/web/ui/templates/service-discovery.html
+++ b/web/ui/templates/service-discovery.html
@@ -1,7 +1,6 @@
 {{define "head"}}
 <link type="text/css" rel="stylesheet" href="{{ pathPrefix }}/static/css/targets.css?v={{ buildVersion }}">
 <script src="{{ pathPrefix }}/static/js/targets.js?v={{ buildVersion }}"></script>
-{{end}}
 
 <style>
   *[id]:before {
@@ -12,6 +11,7 @@
     visibility: hidden;
   }
 </style>
+{{end}}
 
 {{define "content"}}
   <div class="container-fluid">
@@ -19,29 +19,24 @@
     <h1>Service Discovery</h1>
     <div>
       <ul>
-        {{range $i, $job := .Index}}
-          <li>
-            <a href="#job-{{$job}}">{{$job}}</a> ({{ index $.Active $i }}/{{ index $.Total $i }} active targets)
-          </li>
-        {{end}}
+        {{- range $i, $job := .Index}}
+          <li><a href="#job-{{$job}}">{{$job}}</a> ({{ index $.Active $i }}/{{ index $.Total $i }} active targets)</li>
+        {{- end}}
       </ul>
     </div>
 
-    {{$targets := .Targets}}
-    {{range $i, $job := .Index}}
+    {{- $targets := .Targets}}
+    {{- range $i, $job := .Index}}
 
     <div class="table-container">
       <h2 class="job_header" id="job-{{$job}}">
-        {{$job}}
-        <button type="button" class="targets collapsed-table btn btn-primary">show more</button>
+        {{$job}} <button type="button" class="targets collapsed-table btn btn-primary">show more</button>
       </h2>
-      {{with index $.Dropped $i}}
-      {{if gt . 100 }}
-      <div class="collapsed-element" style="display:none">
-        {{ . }} targets have been dropped, showing only the first 100 dropped targets as examples.
-      </div>
-      {{end}}
-      {{end}}
+      {{- with index $.Dropped $i}}
+      {{- if gt . 100 }}
+      <div class="collapsed-element" style="display:none">{{ . }} targets have been dropped, showing only the first 100 dropped targets as examples.</div>
+      {{- end}}
+      {{- end}}
       <table class="table table-sm table-bordered table-striped table-hover" style="display:none">
         <thead class="job_details">
           <tr>
@@ -51,42 +46,34 @@
         </thead>
         <tbody>
 
-        {{range index $targets $job}}
+        {{- range index $targets $job}}
           <tr>
             <td class="labels">
-                {{$labels := .DiscoveredLabels.Map }}
+                {{- $labels := .DiscoveredLabels.Map }}
                 <ul class="list-inline" style="list-style-type:none">
-                  {{range $label, $value := $labels}}
-                    <li>
-                      <span class="badge badge-primary">{{$label}}="{{$value}}"</span>
-                    </li>
-                  {{else}}
-                  <li>
-                    <span class="badge badge-default">none</span>
-                  </li>
-                  {{end}}
+                  {{- range $label, $value := $labels }}
+                    <li><span class="badge badge-primary">{{$label}}="{{$value}}"</span></li>
+                  {{- else -}}
+                    <li><span class="badge badge-default">none</span></li>
+                  {{- end }}
                 </ul>
             </td>
             <td class="labels">
-                {{$labels := .Labels.Map }}
+                {{- $labels := .Labels.Map }}
                 <ul class="list-inline" style="list-style-type:none">
-                  {{range $label, $value := $labels}}
-                    <li>
-                      <span class="badge badge-primary">{{$label}}="{{$value}}"</span>
-                    </li>
-                  {{else}}
-                    <li>
-                      <span class="badge badge-default">Dropped</span>
-                    </li>
-                  {{end}}
+                  {{- range $label, $value := $labels }}
+                    <li><span class="badge badge-primary">{{$label}}="{{$value}}"</span></li>
+                  {{- else -}}
+                    <li><span class="badge badge-default">Dropped</span></li>
+                  {{- end }}
                 </ul>
             </td>
           </tr>
-        {{end}}
+        {{- end}}
         </tbody>
       </table>
     </div>
-    {{ end }}
+    {{- end }}
   </div>
 
 {{end}}
diff --git a/web/ui/templates/targets.html b/web/ui/templates/targets.html
index b4bef875b..813f858f7 100644
--- a/web/ui/templates/targets.html
+++ b/web/ui/templates/targets.html
@@ -14,12 +14,12 @@
       <label class="btn btn-primary">
         <input type="radio" name="targets" id="unhealthy-targets" autocomplete="off"> Unhealthy
       </label>
-      </br>
+      <br />
   </div>
 
-    {{range $job, $pool := .TargetPools}}
-    {{$healthy := numHealthy $pool}}
-    {{$total := len $pool}}
+    {{- range $job, $pool := .TargetPools}}
+    {{- $healthy := numHealthy $pool}}
+    {{- $total := len $pool}}
 
     <div class="table-container">
       <h2 class="job_header{{if lt $healthy $total}} danger{{end}}">
@@ -38,46 +38,36 @@
           </tr>
         </thead>
         <tbody>
-        {{range $pool}}
+        {{- range $pool}}
           <tr>
             <td class="endpoint">
               <a href="{{.URL | globalURL}}">{{.URL.Scheme}}://{{.URL.Host}}{{.URL.Path}}</a><br>
-              {{range $label, $values := .URL.Query }}
-                {{range $i, $value := $values}}
+              {{- range $label, $values := .URL.Query }}
+                {{- range $i, $value := $values}}
                   <span class="badge badge-primary">{{$label}}="{{$value}}"</span>
-                {{end}}
-              {{end}}
+                {{- end}}
+              {{- end}}
             </td>
             <td class="state">
-              <span class="alert alert-{{ .Health | targetHealthToClass }} state_indicator text-uppercase">
-                {{.Health}}
-              </span>
+              <span class="alert alert-{{ .Health | targetHealthToClass }} state_indicator text-uppercase">{{.Health}}</span>
             </td>
             <td class="labels">
               <span class="cursor-pointer" data-toggle="tooltip" title="" data-html=true data-original-title="<b>Before relabeling:</b>{{range $k, $v := .DiscoveredLabels.Map}}<br>{{$ev := $v | html}}{{$k}}=&quot;{{$ev}}&quot;{{end}}">
-                {{range $label, $value := .Labels.Map}}
+                {{- range $label, $value := .Labels.Map}}
                   <span class="badge badge-primary">{{$label}}="{{$value}}"</span>
-                {{else}}
+                {{- else -}}
                   <span class="badge badge-default">none</span>
-                {{end}}
+                {{- end}}
               </span>
             </td>
-            <td class="last-scrape">
-              {{if .LastScrape.IsZero}}Never{{else}}{{since .LastScrape}} ago{{end}}
-            </td>
-            <td class="scrape-duration">
-              {{humanizeDuration .LastScrapeDuration.Seconds}}
-            </td>
-            <td class="errors">
-              {{if .LastError}}
-              <span class="alert alert-danger state_indicator">{{.LastError}}</span>
-              {{end}}
-            </td>
+            <td class="last-scrape">{{- if .LastScrape.IsZero}}Never{{else}}{{since .LastScrape}} ago{{end}}</td>
+            <td class="scrape-duration">{{- humanizeDuration .LastScrapeDuration.Seconds}}</td>
+            <td class="errors">{{- if .LastError}}<span class="alert alert-danger state_indicator">{{.LastError}}</span>{{end}}</td>
           </tr>
-        {{end}}
+        {{- end}}
         </tbody>
       </table>
     </div>
-    {{ end }}
+    {{- end }}
   </div>
 {{end}}