diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index 7e0d7dd843..cb332b7ae0 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -133,19 +133,11 @@
 /******************************************************** LOCAL CONTROLS */
 // Controls placed in proximity to or overlaid on components and views
 
-.local-controls-persist {
-
-}
-
 .local-controls-hidden {
     // Used within .has-local-controls, hidden by default
 
 }
 
-.local-controls-flyout {
-
-}
-
 body.desktop .has-local-controls {
     // Helper class, provides hover ability to show local controls
 
@@ -156,7 +148,7 @@ body.desktop .has-local-controls {
     }
 
     .local-controls-hidden {
-        @include trans-prop-nice($props: opacity, $dur: 1000ms);
+        @include trans-prop-nice($props: opacity, $dur: 500ms);
         opacity: 0;
         pointer-events: none;
     }
@@ -211,6 +203,7 @@ body.desktop .has-local-controls {
     cursor: pointer;
     height: 1em; width: 1em;
     line-height: inherit;
+    position: relative;
     &:before {
         position: absolute;
         @include trans-prop-nice(transform, 100ms);
diff --git a/platform/features/notebook/res/sass/_notebook-base.scss b/platform/features/notebook/res/sass/_notebook-base.scss
index 8a36390df7..fa3376c350 100644
--- a/platform/features/notebook/res/sass/_notebook-base.scss
+++ b/platform/features/notebook/res/sass/_notebook-base.scss
@@ -144,6 +144,13 @@
     }
 }
 
+.s-status-taking-snapshot,
+.overlay.snapshot {
+    // Handle overflow-y issues with tables and html2canvas
+    .l-sticky-headers .l-tabular-body { overflow: auto; }
+}
+
+
 /********************************************* MOBILE */
 body.mobile {
     // Hide the start entry area, and disable ability to edit or delete an entry in mobile context
@@ -285,24 +292,3 @@ body.phone.portrait {
 .overlay.l-dialog .abs.editor {
     padding-right: 0;
 }
-
-/*
-.overlay.l-dialog .outer-holder.annotation-dialog{
-    width: 90%;
-    height: 90%;
-}
-*/
-
-/*
-.snap-annotation-wrapper{
-    padding-top: 40px;
-}
-
-
-.t-console {
-    // Temp console-like reporting element
-    max-height: 200px;
-    box-sizing: border-box;
-    padding: 5px;
-}
-*/
diff --git a/platform/features/notebook/res/sass/_notebook-thematic.scss b/platform/features/notebook/res/sass/_notebook-thematic.scss
index c2ebb32d29..0dc1c76eff 100644
--- a/platform/features/notebook/res/sass/_notebook-thematic.scss
+++ b/platform/features/notebook/res/sass/_notebook-thematic.scss
@@ -34,10 +34,12 @@
 }
 
 .s-notebook-entry {
+    transition: background-color 500ms ease-out;
     background-color: rgba($colorBodyFg, 0.1);
     border-radius: $basicCr;
 
     &:hover {
+        transition: background-color 50ms ease-in;
         background-color: rgba($colorBodyFg, 0.2);
     }
 
diff --git a/platform/features/notebook/res/templates/notebook.html b/platform/features/notebook/res/templates/notebook.html
index 470ff32c1e..53cb8ed4b3 100644
--- a/platform/features/notebook/res/templates/notebook.html
+++ b/platform/features/notebook/res/templates/notebook.html
@@ -109,7 +109,7 @@
                     </div>
                 </div>
                 <!-- delete entry -->
-                <div class="holder flex-elem local-control notebook-entry-delete">
+                <div class="holder flex-elem local-control local-controls-hidden notebook-entry-delete">
                     <a class="s-icon-button icon-trash" id={{entry.id}} title="Delete Entry" ng-click="deleteEntry($event)"></a>
                 </div>
             </li>
diff --git a/src/plugins/summaryWidget/res/conditionTemplate.html b/src/plugins/summaryWidget/res/conditionTemplate.html
index 51488ae287..9cd30115ad 100644
--- a/src/plugins/summaryWidget/res/conditionTemplate.html
+++ b/src/plugins/summaryWidget/res/conditionTemplate.html
@@ -4,7 +4,7 @@
         <span class="t-configuration"> </span>
         <span class="t-value-inputs"> </span>
     </span>
-    <span class="flex-elem local-control l-condition-action-buttons-wrapper">
+    <span class="flex-elem local-control local-controls-hidden l-condition-action-buttons-wrapper">
         <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this condition"></a>
         <a class="s-icon-button icon-trash t-delete" title="Delete this condition"></a>
     </span>
diff --git a/src/plugins/summaryWidget/res/ruleTemplate.html b/src/plugins/summaryWidget/res/ruleTemplate.html
index 217db4c76b..089f8f8b1b 100644
--- a/src/plugins/summaryWidget/res/ruleTemplate.html
+++ b/src/plugins/summaryWidget/res/ruleTemplate.html
@@ -3,7 +3,7 @@
         <div class="widget-rule-header">
             <span class="flex-elem l-widget-thumb-wrapper">
                 <span class="grippy-holder">
-                    <span class="t-grippy grippy local-control"></span>
+                    <span class="t-grippy grippy local-control local-controls-hidden"></span>
                 </span>
                 <span class="view-control expanded"></span>
                 <span class="t-widget-thumb widget-thumb">
@@ -12,7 +12,7 @@
             </span>
             <span class="flex-elem rule-title">Default Title</span>
             <span class="flex-elem rule-description grows">Rule description goes here</span>
-            <span class="flex-elem local-control l-rule-action-buttons-wrapper">
+            <span class="flex-elem local-control local-controls-hidden l-rule-action-buttons-wrapper">
                 <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this rule"></a>
                 <a class="s-icon-button icon-trash t-delete" title="Delete this rule"></a>
             </span>
diff --git a/src/plugins/summaryWidget/res/testDataItemTemplate.html b/src/plugins/summaryWidget/res/testDataItemTemplate.html
index 6c455aaec3..6afff4f5d2 100644
--- a/src/plugins/summaryWidget/res/testDataItemTemplate.html
+++ b/src/plugins/summaryWidget/res/testDataItemTemplate.html
@@ -7,7 +7,7 @@
                 <span class="equal-to hidden"> equal to </span>
                 <span class="t-value-inputs"></span>
             </span>
-            <span class="flex-elem local-control l-widget-test-data-item-action-buttons-wrapper">
+            <span class="flex-elem local-control local-controls-hidden l-widget-test-data-item-action-buttons-wrapper">
                 <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this test value"></a>
                 <a class="s-icon-button icon-trash t-delete" title="Delete this test value"></a>
             </span>
diff --git a/src/plugins/summaryWidget/src/Condition.js b/src/plugins/summaryWidget/src/Condition.js
index 3dd9586f37..f24684a0d6 100644
--- a/src/plugins/summaryWidget/src/Condition.js
+++ b/src/plugins/summaryWidget/src/Condition.js
@@ -188,7 +188,7 @@ define([
                 if (!this.config.values[index]) {
                     this.config.values[index] = (inputType === 'number' ? 0 : '');
                 }
-                newInput = $('<input class="sm" type = "' + inputType + '" value = "' + this.config.values[index] + '"> </input>');
+                newInput = $('<input type = "' + inputType + '" value = "' + this.config.values[index] + '"> </input>');
                 this.valueInputs.push(newInput.get(0));
                 inputArea.append(newInput);
                 index += 1;