diff --git a/platform/commonUI/general/res/css/forms.css b/platform/commonUI/general/res/css/forms.css
index 6d44d48275..12c49d72f3 100644
--- a/platform/commonUI/general/res/css/forms.css
+++ b/platform/commonUI/general/res/css/forms.css
@@ -1,4 +1,4 @@
-/* line 2, ../sass/forms/_elems.scss */
+/* line 3, ../sass/forms/_elems.scss */
 .form .section-header {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -9,13 +9,13 @@
   font-size: 0.8em;
   margin-top: 5px;
   padding: 5px; }
-  /* line 8, ../sass/forms/_elems.scss */
+  /* line 9, ../sass/forms/_elems.scss */
   .form .section-header:first-child {
     margin-top: 0; }
-/* line 12, ../sass/forms/_elems.scss */
+/* line 13, ../sass/forms/_elems.scss */
 .form .form-section {
   position: relative; }
-/* line 16, ../sass/forms/_elems.scss */
+/* line 17, ../sass/forms/_elems.scss */
 .form .form-row {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -26,10 +26,10 @@
   margin-top: 5px;
   padding: 5px;
   position: relative; }
-  /* line 23, ../sass/forms/_elems.scss */
+  /* line 24, ../sass/forms/_elems.scss */
   .form .form-row:first-child {
     border-top: none; }
-  /* line 27, ../sass/forms/_elems.scss */
+  /* line 29, ../sass/forms/_elems.scss */
   .form .form-row .label,
   .form .form-row .controls {
     -webkit-box-sizing: border-box;
@@ -41,27 +41,34 @@
     font-size: 0.75rem;
     line-height: 22px;
     min-height: 22px; }
-  /* line 36, ../sass/forms/_elems.scss */
+  /* line 38, ../sass/forms/_elems.scss */
   .form .form-row > .label {
     float: left;
     position: relative;
     white-space: nowrap;
     width: 20%; }
-  /* line 44, ../sass/forms/_elems.scss */
+  /* line 46, ../sass/forms/_elems.scss */
   .form .form-row .value {
     color: #cccccc; }
-  /* line 48, ../sass/forms/_elems.scss */
+  /* line 50, ../sass/forms/_elems.scss */
   .form .form-row .controls {
     float: left;
     position: relative;
     width: 79%; }
-    /* line 52, ../sass/forms/_elems.scss */
+    /* line 55, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-composite-control {
+      display: inline-block; }
+      /* line 57, ../sass/forms/_elems.scss */
+      .form .form-row .controls .l-composite-control.l-checkbox {
+        line-height: 14px;
+        margin-right: 5px; }
+    /* line 65, ../sass/forms/_elems.scss */
     .form .form-row .controls .select {
       margin-right: 5px; }
-  /* line 57, ../sass/forms/_elems.scss */
+  /* line 70, ../sass/forms/_elems.scss */
   .form .form-row .field-hints {
     color: #666666; }
-  /* line 61, ../sass/forms/_elems.scss */
+  /* line 74, ../sass/forms/_elems.scss */
   .form .form-row .selector-list {
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
@@ -72,7 +79,7 @@
     position: relative;
     height: 150px;
     max-width: 50%; }
-    /* line 69, ../sass/forms/_elems.scss */
+    /* line 82, ../sass/forms/_elems.scss */
     .form .form-row .selector-list .wrapper {
       overflow-y: auto;
       position: absolute;
@@ -81,15 +88,35 @@
       bottom: 5px;
       left: 5px; }
 
-/* line 83, ../sass/forms/_elems.scss */
+/* line 96, ../sass/forms/_elems.scss */
 label.form-control.checkbox input {
   margin-right: 5px;
   vertical-align: top; }
 
-/* line 89, ../sass/forms/_elems.scss */
-.hint {
+/* line 103, ../sass/forms/_elems.scss */
+.hint,
+.s-hint {
   font-size: 0.9em; }
 
+/* line 107, ../sass/forms/_elems.scss */
+.l-result {
+  display: inline-block;
+  min-width: 32px;
+  min-height: 32px;
+  position: relative;
+  vertical-align: top; }
+  /* line 114, ../sass/forms/_elems.scss */
+  .l-result div.s-hint {
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    -ms-border-radius: 3px;
+    -o-border-radius: 3px;
+    border-radius: 3px;
+    background: rgba(255, 153, 0, 0.8);
+    display: block;
+    color: #ffd699;
+    padding: 5px; }
+
 /* line 1, ../sass/forms/_textarea.scss */
 .edit-main textarea {
   -webkit-appearance: none;
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index e02d7cb235..f98ab973da 100644
--- a/platform/commonUI/general/res/css/theme-espresso.css
+++ b/platform/commonUI/general/res/css/theme-espresso.css
@@ -1122,6 +1122,13 @@ a.l-btn span {
   margin-left: 5px; }
 
 /* line 157, ../sass/controls/_controls.scss */
+.l-composite-control {
+  vertical-align: middle; }
+  /* line 160, ../sass/controls/_controls.scss */
+  .l-composite-control.l-checkbox .composite-control-label {
+    line-height: 18px; }
+
+/* line 166, ../sass/controls/_controls.scss */
 .control-group {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -1129,16 +1136,16 @@ a.l-btn span {
   border-left: 1px solid #4d4d4d;
   padding: 0 5px;
   position: relative; }
-  /* line 164, ../sass/controls/_controls.scss */
+  /* line 173, ../sass/controls/_controls.scss */
   .control-group:first-child {
     border-left: none;
     padding-left: 0; }
 
-/* line 170, ../sass/controls/_controls.scss */
+/* line 179, ../sass/controls/_controls.scss */
 .btn-set {
   display: inline-block;
   position: relative; }
-  /* line 175, ../sass/controls/_controls.scss */
+  /* line 184, ../sass/controls/_controls.scss */
   .btn-set .btn,
   .btn-set .t-btn {
     -webkit-border-radius: 0;
@@ -1148,7 +1155,7 @@ a.l-btn span {
     border-radius: 0;
     border-left: 1px solid #666666;
     margin-left: 0; }
-    /* line 179, ../sass/controls/_controls.scss */
+    /* line 188, ../sass/controls/_controls.scss */
     .btn-set .btn:first-child,
     .btn-set .t-btn:first-child {
       border-left: none;
@@ -1158,7 +1165,7 @@ a.l-btn span {
       -moz-border-radius-bottomleft: 3px;
       -webkit-border-bottom-left-radius: 3px;
       border-bottom-left-radius: 3px; }
-    /* line 183, ../sass/controls/_controls.scss */
+    /* line 192, ../sass/controls/_controls.scss */
     .btn-set .btn:last-child,
     .btn-set .t-btn:last-child {
       -moz-border-radius-topright: 3px;
@@ -1168,7 +1175,7 @@ a.l-btn span {
       -webkit-border-bottom-right-radius: 3px;
       border-bottom-right-radius: 3px; }
 
-/* line 194, ../sass/controls/_controls.scss */
+/* line 203, ../sass/controls/_controls.scss */
 .object-browse-bar .btn,
 .object-browse-bar .t-btn,
 .top-bar .buttons-main .btn,
@@ -1179,7 +1186,7 @@ a.l-btn span {
   font-size: 12.6px;
   height: 28px;
   line-height: 28px; }
-  /* line 200, ../sass/controls/_controls.scss */
+  /* line 209, ../sass/controls/_controls.scss */
   .object-browse-bar .btn .icon:not(.invoke-menu),
   .object-browse-bar .t-btn .icon:not(.invoke-menu),
   .top-bar .buttons-main .btn .icon:not(.invoke-menu),
@@ -1189,21 +1196,22 @@ a.l-btn span {
     font-size: 150%;
     vertical-align: middle; }
 
-/* line 208, ../sass/controls/_controls.scss */
+/* line 217, ../sass/controls/_controls.scss */
 label.checkbox.custom {
   cursor: pointer;
   display: inline-block;
   line-height: 14px;
   margin-right: 20px;
   padding-left: 19px;
-  position: relative; }
-  /* line 218, ../sass/controls/_controls.scss */
+  position: relative;
+  vertical-align: top; }
+  /* line 228, ../sass/controls/_controls.scss */
   label.checkbox.custom em {
     color: #999999;
     display: inline-block;
     height: 14px;
     min-width: 14px; }
-    /* line 223, ../sass/controls/_controls.scss */
+    /* line 233, ../sass/controls/_controls.scss */
     label.checkbox.custom em:before {
       -webkit-border-radius: 2.25px;
       -moz-border-radius: 2.25px;
@@ -1224,51 +1232,51 @@ label.checkbox.custom {
       top: 0;
       position: absolute;
       text-align: center; }
-  /* line 241, ../sass/controls/_controls.scss */
+  /* line 251, ../sass/controls/_controls.scss */
   label.checkbox.custom.no-text {
     overflow: hidden;
     margin-right: 0;
     padding-left: 0;
     height: 14px;
     width: 14px; }
-    /* line 247, ../sass/controls/_controls.scss */
+    /* line 257, ../sass/controls/_controls.scss */
     label.checkbox.custom.no-text em {
       overflow: hidden; }
-  /* line 251, ../sass/controls/_controls.scss */
+  /* line 261, ../sass/controls/_controls.scss */
   label.checkbox.custom input {
     display: none; }
-    /* line 253, ../sass/controls/_controls.scss */
+    /* line 263, ../sass/controls/_controls.scss */
     label.checkbox.custom input:checked ~ em:before {
       background: #0099cc;
       color: #ccf2ff;
       content: "2"; }
 
-/* line 261, ../sass/controls/_controls.scss */
+/* line 271, ../sass/controls/_controls.scss */
 .input-labeled {
   margin-left: 5px; }
-  /* line 263, ../sass/controls/_controls.scss */
+  /* line 273, ../sass/controls/_controls.scss */
   .input-labeled label {
     display: inline-block;
     margin-right: 3px; }
-  /* line 267, ../sass/controls/_controls.scss */
+  /* line 277, ../sass/controls/_controls.scss */
   .input-labeled.inline {
     display: inline-block; }
-  /* line 270, ../sass/controls/_controls.scss */
+  /* line 280, ../sass/controls/_controls.scss */
   .input-labeled:first-child {
     margin-left: 0; }
 
-/* line 275, ../sass/controls/_controls.scss */
+/* line 285, ../sass/controls/_controls.scss */
 .btn-menu label.checkbox.custom {
   margin-left: 5px; }
 
-/* line 280, ../sass/controls/_controls.scss */
+/* line 290, ../sass/controls/_controls.scss */
 .item .checkbox.checked label {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
   border-bottom: none; }
 
-/* line 286, ../sass/controls/_controls.scss */
+/* line 296, ../sass/controls/_controls.scss */
 .btn-menu {
   background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040));
   background-image: -webkit-linear-gradient(#4d4d4d, #404040);
@@ -1298,39 +1306,39 @@ label.checkbox.custom {
     background-image: -moz-linear-gradient(#666666, #4d4d4d);
     background-image: -o-linear-gradient(#666666, #4d4d4d);
     background-image: linear-gradient(#666666, #4d4d4d); }
-  /* line 293, ../sass/controls/_controls.scss */
+  /* line 303, ../sass/controls/_controls.scss */
   .btn-menu.dropdown {
     padding-right: 7px; }
-  /* line 298, ../sass/controls/_controls.scss */
+  /* line 308, ../sass/controls/_controls.scss */
   .btn-menu:not(.disabled):hover {
     color: #cccccc; }
-  /* line 302, ../sass/controls/_controls.scss */
+  /* line 312, ../sass/controls/_controls.scss */
   .btn-menu.btn-invoke-menu {
     color: #0099cc;
     padding: 0 5px; }
-    /* line 306, ../sass/controls/_controls.scss */
+    /* line 316, ../sass/controls/_controls.scss */
     .btn-menu.btn-invoke-menu:hover {
       color: deepskyblue; }
-  /* line 311, ../sass/controls/_controls.scss */
+  /* line 321, ../sass/controls/_controls.scss */
   .btn-menu .type-icon {
     margin-right: 5px; }
-  /* line 314, ../sass/controls/_controls.scss */
+  /* line 324, ../sass/controls/_controls.scss */
   .btn-menu .menu {
     text-align: left; }
-    /* line 317, ../sass/controls/_controls.scss */
+    /* line 327, ../sass/controls/_controls.scss */
     .btn-menu .menu .ui-symbol.icon {
       width: 12px; }
 
-/* line 323, ../sass/controls/_controls.scss */
+/* line 333, ../sass/controls/_controls.scss */
 .top-bar .btn-menu {
   height: 35px;
   line-height: 35px;
   padding-right: 10px; }
-  /* line 331, ../sass/controls/_controls.scss */
+  /* line 341, ../sass/controls/_controls.scss */
   .top-bar .btn-menu.browse-btn {
     margin-right: 5px;
     padding-left: 35px; }
-    /* line 334, ../sass/controls/_controls.scss */
+    /* line 344, ../sass/controls/_controls.scss */
     .top-bar .btn-menu.browse-btn .badge {
       -webkit-border-radius: 4.5px;
       -moz-border-radius: 4.5px;
@@ -1349,30 +1357,29 @@ label.checkbox.custom {
       height: auto; }
 
 /******************************************************** OBJECT-HEADER */
-/* line 351, ../sass/controls/_controls.scss */
+/* line 361, ../sass/controls/_controls.scss */
 .object-header {
   display: inline-block;
   font-size: 1em; }
-  /* line 354, ../sass/controls/_controls.scss */
+  /* line 364, ../sass/controls/_controls.scss */
   .object-header .title {
     color: white; }
-  /* line 357, ../sass/controls/_controls.scss */
+  /* line 367, ../sass/controls/_controls.scss */
   .object-header .type-icon {
     font-size: 1.5em;
     margin-right: 5px;
     vertical-align: middle; }
 
-/* line 366, ../sass/controls/_controls.scss */
+/* line 376, ../sass/controls/_controls.scss */
 .top-bar .object-header,
 .object-browse-bar .object-header {
-  font-size: 1.1em; }
-  /* line 368, ../sass/controls/_controls.scss */
+  font-size: 1.2em; }
   .top-bar .object-header span,
   .object-browse-bar .object-header span {
     display: inline-block; }
 
 /******************************************************** VIEW-CONTROLS */
-/* line 377, ../sass/controls/_controls.scss */
+/* line 387, ../sass/controls/_controls.scss */
 .view-controls .view-type {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -1386,16 +1393,16 @@ label.checkbox.custom {
   line-height: 20px;
   padding-left: 5px;
   padding-right: 5px; }
-  /* line 388, ../sass/controls/_controls.scss */
+  /* line 398, ../sass/controls/_controls.scss */
   .view-controls .view-type.cur {
     background: #666666; }
 
-/* line 393, ../sass/controls/_controls.scss */
+/* line 403, ../sass/controls/_controls.scss */
 .edit-mode .top-bar .control-set.edit-view-controls {
   margin-right: 50px; }
 
 /******************************************************** SLIDERS */
-/* line 404, ../sass/controls/_controls.scss */
+/* line 414, ../sass/controls/_controls.scss */
 .slider .slot {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -1418,7 +1425,7 @@ label.checkbox.custom {
   right: 0;
   bottom: auto;
   left: 0; }
-/* line 415, ../sass/controls/_controls.scss */
+/* line 425, ../sass/controls/_controls.scss */
 .slider .knob {
   background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(100%, #404040));
   background-image: -webkit-linear-gradient(#4d4d4d, #404040);
@@ -1466,12 +1473,12 @@ label.checkbox.custom {
     top: 5px; }
   .slider .knob:not(.disabled):hover:before {
     border-color: rgba(0, 153, 204, 0.9); }
-  /* line 426, ../sass/controls/_controls.scss */
+  /* line 436, ../sass/controls/_controls.scss */
   .slider .knob:before {
     top: 1px;
     bottom: 3px;
     left: 5px; }
-/* line 433, ../sass/controls/_controls.scss */
+/* line 443, ../sass/controls/_controls.scss */
 .slider .range {
   background: rgba(0, 153, 204, 0.6);
   cursor: ew-resize;
@@ -1482,12 +1489,12 @@ label.checkbox.custom {
   left: auto;
   height: auto;
   width: auto; }
-  /* line 443, ../sass/controls/_controls.scss */
+  /* line 453, ../sass/controls/_controls.scss */
   .slider .range:hover {
     background: rgba(0, 153, 204, 0.7); }
 
 /******************************************************** BROWSER ELEMENTS */
-/* line 451, ../sass/controls/_controls.scss */
+/* line 461, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
@@ -1506,7 +1513,7 @@ label.checkbox.custom {
   height: 10px;
   width: 10px; }
 
-/* line 457, ../sass/controls/_controls.scss */
+/* line 467, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar-thumb {
   background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #666666), color-stop(100%, #595959));
   background-image: -webkit-linear-gradient(#666666, #595959 20px);
@@ -1525,7 +1532,7 @@ label.checkbox.custom {
   -moz-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
   box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
   border-top: 1px solid gray; }
-  /* line 464, ../sass/controls/_controls.scss */
+  /* line 474, ../sass/controls/_controls.scss */
   ::-webkit-scrollbar-thumb:hover {
     background-image: -webkit-gradient(linear, 50% 0%, 50% 20, color-stop(0%, #808080), color-stop(100%, #737373));
     background-image: -webkit-linear-gradient(#808080, #737373 20px);
@@ -1533,7 +1540,7 @@ label.checkbox.custom {
     background-image: -o-linear-gradient(#808080, #737373 20px);
     background-image: linear-gradient(#808080, #737373 20px); }
 
-/* line 469, ../sass/controls/_controls.scss */
+/* line 479, ../sass/controls/_controls.scss */
 ::-webkit-scrollbar-corner {
   background: rgba(0, 0, 0, 0.4); }
 
@@ -1746,7 +1753,7 @@ label.checkbox.custom {
   right: 0;
   width: auto; }
 
-/* line 2, ../sass/forms/_elems.scss */
+/* line 3, ../sass/forms/_elems.scss */
 .form .section-header {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
@@ -1757,13 +1764,13 @@ label.checkbox.custom {
   font-size: 0.8em;
   margin-top: 5px;
   padding: 5px; }
-  /* line 8, ../sass/forms/_elems.scss */
+  /* line 9, ../sass/forms/_elems.scss */
   .form .section-header:first-child {
     margin-top: 0; }
-/* line 12, ../sass/forms/_elems.scss */
+/* line 13, ../sass/forms/_elems.scss */
 .form .form-section {
   position: relative; }
-/* line 16, ../sass/forms/_elems.scss */
+/* line 17, ../sass/forms/_elems.scss */
 .form .form-row {
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
@@ -1774,10 +1781,10 @@ label.checkbox.custom {
   margin-top: 5px;
   padding: 5px;
   position: relative; }
-  /* line 23, ../sass/forms/_elems.scss */
+  /* line 24, ../sass/forms/_elems.scss */
   .form .form-row:first-child {
     border-top: none; }
-  /* line 27, ../sass/forms/_elems.scss */
+  /* line 29, ../sass/forms/_elems.scss */
   .form .form-row .label,
   .form .form-row .controls {
     -webkit-box-sizing: border-box;
@@ -1789,27 +1796,34 @@ label.checkbox.custom {
     font-size: 0.75rem;
     line-height: 22px;
     min-height: 22px; }
-  /* line 36, ../sass/forms/_elems.scss */
+  /* line 38, ../sass/forms/_elems.scss */
   .form .form-row > .label {
     float: left;
     position: relative;
     white-space: nowrap;
     width: 20%; }
-  /* line 44, ../sass/forms/_elems.scss */
+  /* line 46, ../sass/forms/_elems.scss */
   .form .form-row .value {
     color: #cccccc; }
-  /* line 48, ../sass/forms/_elems.scss */
+  /* line 50, ../sass/forms/_elems.scss */
   .form .form-row .controls {
     float: left;
     position: relative;
     width: 79%; }
-    /* line 52, ../sass/forms/_elems.scss */
+    /* line 55, ../sass/forms/_elems.scss */
+    .form .form-row .controls .l-composite-control {
+      display: inline-block; }
+      /* line 57, ../sass/forms/_elems.scss */
+      .form .form-row .controls .l-composite-control.l-checkbox {
+        line-height: 14px;
+        margin-right: 5px; }
+    /* line 65, ../sass/forms/_elems.scss */
     .form .form-row .controls .select {
       margin-right: 5px; }
-  /* line 57, ../sass/forms/_elems.scss */
+  /* line 70, ../sass/forms/_elems.scss */
   .form .form-row .field-hints {
     color: #666666; }
-  /* line 61, ../sass/forms/_elems.scss */
+  /* line 74, ../sass/forms/_elems.scss */
   .form .form-row .selector-list {
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
@@ -1820,7 +1834,7 @@ label.checkbox.custom {
     position: relative;
     height: 150px;
     max-width: 50%; }
-    /* line 69, ../sass/forms/_elems.scss */
+    /* line 82, ../sass/forms/_elems.scss */
     .form .form-row .selector-list .wrapper {
       overflow-y: auto;
       position: absolute;
@@ -1829,15 +1843,35 @@ label.checkbox.custom {
       bottom: 5px;
       left: 5px; }
 
-/* line 83, ../sass/forms/_elems.scss */
+/* line 96, ../sass/forms/_elems.scss */
 label.form-control.checkbox input {
   margin-right: 5px;
   vertical-align: top; }
 
-/* line 89, ../sass/forms/_elems.scss */
-.hint {
+/* line 103, ../sass/forms/_elems.scss */
+.hint,
+.s-hint {
   font-size: 0.9em; }
 
+/* line 107, ../sass/forms/_elems.scss */
+.l-result {
+  display: inline-block;
+  min-width: 32px;
+  min-height: 32px;
+  position: relative;
+  vertical-align: top; }
+  /* line 114, ../sass/forms/_elems.scss */
+  .l-result div.s-hint {
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    -ms-border-radius: 3px;
+    -o-border-radius: 3px;
+    border-radius: 3px;
+    background: rgba(255, 153, 0, 0.8);
+    display: block;
+    color: #ffd699;
+    padding: 5px; }
+
 /* line 4, ../sass/forms/_validation.scss */
 .validates > .label {
   padding-right: 25px; }
diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index 0c68f6bc87..77305a9252 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -154,6 +154,15 @@
 	}
 }
 
+.l-composite-control {
+	vertical-align: middle;
+	&.l-checkbox {
+		.composite-control-label {
+			line-height: 18px;
+		}
+	}
+}
+
 .control-group {
 	// Buttons that have a conceptual grouping - internal space between, and a divider between groups.
 	//	@include test();
@@ -215,6 +224,7 @@ label.checkbox.custom {
 	margin-right: $interiorMargin * 4;
 	padding-left: $d + $interiorMargin;
 	position: relative;
+	vertical-align: top;
 	em {
 		color: $colorBodyFg;
 		display: inline-block;
diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss
index 10b496abcd..e2ab6e6c3b 100644
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -1,4 +1,5 @@
 .form {
+//	@include test(orange);
 	.section-header {
 		@include border-radius(3px);
 		background: rgba(white, 0.1);
@@ -23,6 +24,7 @@
 		&:first-child {
 			border-top: none;
 		}
+
 		.label,
 		.controls {
 			@include box-sizing(border-box);
@@ -49,6 +51,17 @@
 			float: left;
             position: relative;
 			width: 99% - $formLabelW; // Start with less than 100% for Firefox
+
+			.l-composite-control {
+				display: inline-block;
+				&.l-checkbox {
+//					@include test();
+//					height: $formRowCtrlsH;
+					line-height: $formRowCtrlsH;
+					margin-right: 5px;
+				}
+			}
+
 			.select {
 				margin-right: $interiorMargin;
 			}
@@ -86,6 +99,23 @@ label.form-control.checkbox {
 	}
 }
 
-.hint {
+.hint,
+.s-hint {
 	font-size: 0.9em;
+}
+
+.l-result {
+	// Used in /vista/channel-query.html and evr-query.html as of 2/24/15
+	display: inline-block;
+	min-width: 32px; min-height: 32px;
+	position: relative;
+	vertical-align: top;
+
+	div.s-hint {
+		@include border-radius($basicCr);
+		background: rgba($colorFormInvalid, 0.8);
+		display: block;
+		color: lighten($colorFormInvalid, 30%);
+		padding: $interiorMargin;
+	}
 }
\ No newline at end of file
diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html
index 9bdc765645..276e66ff66 100644
--- a/platform/commonUI/general/res/templates/controls/switcher.html
+++ b/platform/commonUI/general/res/templates/controls/switcher.html
@@ -24,10 +24,11 @@
         </div>
     </div>
 
-    <span class="btn"
+	<!-- CH commented out 2/24/15 - really don't think we need this. Single view is what it is. -->
+    <!--span class="btn"
           ng-if="view.length === 1">
         <span class="ui-symbol icon type-icon">{{ngModel.selected.glyph}}</span>
         <span>{{ngModel.selected.name}}</span>
-    </span>
+    </span-->
 
 </span>
\ No newline at end of file
diff --git a/platform/forms/res/templates/controls/checkbox.html b/platform/forms/res/templates/controls/checkbox.html
index 0152677ce6..c8d09f0303 100644
--- a/platform/forms/res/templates/controls/checkbox.html
+++ b/platform/forms/res/templates/controls/checkbox.html
@@ -3,5 +3,5 @@
            name="mctControl"
            ng-model="ngModel[field]"
            ng-disabled="ngDisabled">
-    <em>&nbsp;</em>
+    <em></em>
 </label>
diff --git a/platform/forms/res/templates/controls/composite.html b/platform/forms/res/templates/controls/composite.html
index f6a4d9f46a..3de753d6f9 100644
--- a/platform/forms/res/templates/controls/composite.html
+++ b/platform/forms/res/templates/controls/composite.html
@@ -1,15 +1,17 @@
 <span ng-controller="CompositeController as compositeCtrl">
     <ng-form name="mctFormItem" ng-repeat="item in structure.items">
-        <mct-control key="item.control"
-                     ng-model="ngModel[field]"
-                     ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
-                     ng-pattern="ngPattern"
-                     options="item.options"
-                     structure="row"
-                     field="$index">
-        </mct-control>
-        <span class="composite-control-label">
-            {{item.name}}
-        </span>
+	    <div class="l-composite-control l-{{item.control}}">
+	        <mct-control key="item.control"
+	                     ng-model="ngModel[field]"
+	                     ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
+	                     ng-pattern="ngPattern"
+	                     options="item.options"
+	                     structure="row"
+	                     field="$index">
+	        </mct-control>
+	        <span class="composite-control-label">
+	            {{item.name}}
+	        </span>
+	    </div>
     </ng-form>
-</span>
\ No newline at end of file
+</span>