diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss
index cabf4287d5..210407aaf1 100644
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -87,9 +87,7 @@
 			}
 		}
 
-		.field-hints {
-			color: darken($colorBodyFg, 20%);
-		}
+		.hint, .field-hints {  color: $colorFieldHint;  }
 
 		.selector-list {
 			// Used in create overlay to display tree view
@@ -130,6 +128,14 @@
     }
 }
 
+.l-controls-under.l-flex-row {
+    // Change to use column layout
+    @include flex-direction(column);
+    .flex-elem {
+        margin-bottom: $interiorMarginLg;
+    }
+}
+
 .no-validate {
     .form .form-row >.label {
         padding-right: 0;
diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss
index bfacefa951..279f738e37 100644
--- a/platform/commonUI/general/res/sass/overlay/_overlay.scss
+++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss
@@ -65,9 +65,7 @@
         margin-bottom: $interiorMargin;
     }
 
-    .hint {
-        color: pushBack($colorOvrFg, 20%);
-    }
+    .hint, .field-hints { color: $colorFieldHintOverlay !important;  }
 
     .abs.top-bar {
         height: $ovrTopBarH;
diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss
index 9c201db6df..729a813a12 100644
--- a/platform/commonUI/themes/espresso/res/sass/_constants.scss
+++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss
@@ -77,6 +77,7 @@ $colorInputBg: rgba(#000, 0.1);
 $colorInputFg: pullForward($colorBodyFg, 20%);
 $colorFormText: rgba(#fff, 0.5);
 $colorInputIcon: pushBack($colorBodyFg, 15%);
+$colorFieldHint: pullForward($colorBodyFg, 20%);
 
 // Inspector
 $colorInspectorBg: pullForward($colorBodyBg, 3%);
@@ -125,6 +126,7 @@ $colorOvrBg: pullForward($colorBodyBg, 10%);
 $colorOvrFg: pullForward($colorBodyFg, 30%);
 $colorOvrBtnBg: pullForward($colorOvrBg, 20%);
 $colorOvrBtnFg: #fff;
+$colorFieldHintOverlay: pullForward($colorOvrBg, 30%);
 
 // Items
 $colorItemBg: lighten($colorBodyBg, 5%);
diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss
index 9206b3632b..0d8430a7ec 100644
--- a/platform/commonUI/themes/snow/res/sass/_constants.scss
+++ b/platform/commonUI/themes/snow/res/sass/_constants.scss
@@ -77,6 +77,7 @@ $colorInputBg: $colorGenBg;
 $colorInputFg: $colorBodyFg;
 $colorFormText: pushBack($colorBodyFg, 10%);
 $colorInputIcon: pushBack($colorBodyFg, 25%);
+$colorFieldHint: pullForward($colorBodyFg, 40%);
 
 // Inspector
 $colorInspectorBg: pullForward($colorBodyBg, 5%);
@@ -125,6 +126,7 @@ $colorOvrBg: $colorBodyBg;
 $colorOvrFg: $colorBodyFg;
 $colorOvrBtnBg: pullForward($colorOvrBg, 40%);
 $colorOvrBtnFg: #fff;
+$colorFieldHintOverlay: pullForward($colorOvrBg, 40%);
 
 // Items
 $colorItemBg: #ddd;
diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js
index f298cb887e..0e5275b054 100644
--- a/platform/features/timeline/bundle.js
+++ b/platform/features/timeline/bundle.js
@@ -312,7 +312,8 @@ define([
                                         "dialog": {
                                             "control": "selector",
                                             "name": "Modes",
-                                            "type": "mode"
+                                            "type": "mode",
+                                            "layout": "controls-under"
                                         },
                                         "property": "modes"
                                     },
@@ -324,7 +325,8 @@ define([
                                         "dialog": {
                                             "control": "textfield",
                                             "name": "Link",
-                                            "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$"
+                                            "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
+                                            "cssclass": "l-input-lg"
                                         },
                                         "property": "link"
                                     },
diff --git a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
index 94c20d2ace..e5ca69e15c 100644
--- a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
+++ b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
@@ -29,9 +29,11 @@
                }">
     <div class="l-cols">
         <span class="l-col l-col-icon l-plot-resource"
-              ng-click="ngModel.toggleGraph()">
+              ng-click="ngModel.toggleGraph()"
+              title="Click to enable or disable inclusion in Resource Graphing">
             <span class="ui-symbol"
-                  ng-show="ngModel.graph()">
+                  ng-show="ngModel.graph()"
+                  >
                 &#x00e9;
             </span>
         </span>
diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html
index 3f8acf1073..88903a7011 100644
--- a/platform/features/timeline/res/templates/timeline.html
+++ b/platform/features/timeline/res/templates/timeline.html
@@ -26,20 +26,17 @@
     <!-- LEFT PANE: TABULAR AND RESOURCE LEGEND AREAS -->
     <mct-split-pane anchor="bottom"
                     position="pane.y"
-                    class="abs horizontal split-pane-component l-timeline-pane l-pane-l t-pane-v"
-                    >
+                    class="abs horizontal split-pane-component l-timeline-pane l-pane-l t-pane-v">
         <!-- TOP PANE TABULAR AREA. ADD CLASS "hidden" FOR INTERIM NO-TABULAR DELIVERY -->
         <div class="split-pane-component s-timeline-tabular l-timeline-pane t-pane-h l-pane-top">
             <!-- TABULAR LEFT FIXED AREA -->
-            <div
-                class="t-pane-v l-pane-l l-tabular-l"
-                ng-if="true"
-                >
+            <div class="t-pane-v l-pane-l l-tabular-l"
+                ng-if="true">
 
                     <div class="t-header l-header s-header">
                         <div class="l-cols">
-                            <span class="l-col l-col-icon l-plot-resource ui-symbol">&#x00e9;</span>
-                            <span class="l-col  l-col-icon l-col-link ui-symbol">&#x00e8;</span>
+                            <span title="Resource Graphing: click a row to toggle" class="l-col l-col-icon l-plot-resource ui-symbol">&#x00e9;</span>
+                            <span title="Activity Links" class="l-col  l-col-icon l-col-link ui-symbol">&#x00e8;</span>
                             <span class="l-col l-title">Title</span>
                         </div>
                     </div>
@@ -54,9 +51,7 @@
             </div>
 
             <!-- TABULAR RIGHT HORZ SCROLLING AREA -->
-            <div
-                class="t-pane-v l-pane-r l-tabular-r"
-                >
+            <div class="t-pane-v l-pane-r l-tabular-r">
                 <div class="l-width">
                     <div class="t-header l-header s-header">
                         <div class="l-cols">
@@ -102,12 +97,10 @@
     <span ng-controller="TimelineZoomController as zoomController" class="abs">
     <mct-split-pane anchor="bottom"
                     position="pane.y"
-                    class="abs split-pane-component l-timeline-pane l-pane-r t-pane-v"
-                    >
+                    class="abs split-pane-component l-timeline-pane l-pane-r t-pane-v">
 
         <!-- TOP PANE GANTT BARS -->
-        <div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt"
-             >
+        <div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt">
             <div class="l-hover-btns-holder s-hover-btns-holder t-btns-zoom">
                 <a class="t-btn l-btn s-btn"
                    ng-click="zoomController.zoom(-1)"
@@ -124,8 +117,7 @@
                 </a>
             </div>
 
-            <div style="overflow: hidden; position: absolute; left: 0; top: 0; right: 0; height: 30px;"
-                 mct-scroll-x="scroll.x">
+            <div style="overflow: hidden; position: absolute; left: 0; top: 0; right: 0; height: 30px;" mct-scroll-x="scroll.x">
                 <mct-include key="'timeline-ticks'"
                              parameters="{
                                          fullWidth: zoomController.toPixels(zoomController.duration()),
@@ -137,9 +129,6 @@
                 </mct-include>
             </div>
 
-            <!-- TO-DO:
-                Make this control y-scroll of both .t-swimlanes-holder elements in TOP PANE TABULAR AREA
-            -->
             <div class="t-swimlanes-holder l-swimlanes-holder"
                  mct-scroll-x="scroll.x"
                  mct-scroll-y="scroll.y">
@@ -175,12 +164,9 @@
                                   mct-drag-up="handle.finish()">
                             </span>
                         </span>
-
                     </div>
                 </div>
             </div>
-
-
         </div>
 
         <!-- HORZ SPLITTER -->
@@ -188,11 +174,8 @@
 
         <!-- BOTTOM PANE RESOURCE GRAPHS AND RIGHT PANE HORIZONTAL SCROLL CONTROL -->
         <div class="split-pane-component l-timeline-resource-graph l-timeline-pane t-pane-h l-pane-btm">
-
             <div class="l-graphs-holder"
                  mct-resize="scroll.width = bounds.width">
-
-                <!-- TO-DO: Make this control y-scroll of .t-graph-labels-holder -->
                 <div class="t-graphs l-graphs">
                     <mct-include key="'timeline-resource-graphs'"
                                  parameters="{
@@ -202,9 +185,7 @@
                                              }">
                     </mct-include>
                 </div>
-
             </div>
-            <!-- TO-DO:  Make this control x-scroll of .t-timeline-gantt -->
             <div mct-scroll-x="scroll.x"
                  class="t-pane-r-scroll-h-control l-scroll-control s-scroll-control">
                 <div class="l-width-control"
diff --git a/platform/forms/res/templates/form.html b/platform/forms/res/templates/form.html
index 60046824a8..2f8b266e08 100644
--- a/platform/forms/res/templates/form.html
+++ b/platform/forms/res/templates/form.html
@@ -33,7 +33,7 @@
                                invalid: mctFormInner.$dirty && !mctFormInner.$valid,
                                first: $index < 1,
                                'l-controls-first': row.layout === 'control-first',
-                               'l-input-sm': row.inputsize === 'sm'
+                               'l-controls-under': row.layout === 'controls-under'
                                }">
                     <div class='label flex-elem' title="{{row.description}}">
                         {{row.name}}