diff --git a/templates/standalone/modal.julius b/templates/standalone/modal.julius
index 65eb3fef0..00486e6a8 100644
--- a/templates/standalone/modal.julius
+++ b/templates/standalone/modal.julius
@@ -90,8 +90,9 @@
             var body = doc.body, html = doc.documentElement;
             var height = Math.max( body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight );
 
-            frame.style.height = "calc(" + (height + "px") + " + 1em)";
+            frame.style.height = height.toPrecision() + "px";
             frame.style.visibility = 'visible';
+            frame.setAttribute("scrolling", "no");
 
             doc.querySelectorAll("form").forEach(function(form) {
                 form.setAttribute("target", "_top");
diff --git a/templates/standalone/modal.lucius b/templates/standalone/modal.lucius
index 194c69515..5ba3a7a07 100644
--- a/templates/standalone/modal.lucius
+++ b/templates/standalone/modal.lucius
@@ -4,14 +4,14 @@ div.modal {
   top: 50%;
   transform: translate(-50%, -50%) scale(0.8, 0.8);
   display: block;
-  background-color: rgba(255, 255, 255, 0.99);
+  background-color: rgba(255, 255, 255, 1);
   min-width: 60vw;
   min-height: 100px;
   max-height: calc(100vh - 30px);
   border-radius: 2px;
   z-index: -1;
   color: var(--color-font);
-  padding: 20px;
+  /* padding: 20px; */
   padding-right: 65px;
   overflow: auto;
   transition: all .15s ease;
@@ -29,8 +29,11 @@ div.modal {
     height: calc(60vh);
     width: 100%;
     border-style: none;
-    scroll: auto;
     overflow: auto;
+
+    [scrolling='no'] {
+        overflow: hidden;
+    }
   }
 }
 
diff --git a/templates/standalone/tooltip.lucius b/templates/standalone/tooltip.lucius
index d85415d97..0a2154768 100644
--- a/templates/standalone/tooltip.lucius
+++ b/templates/standalone/tooltip.lucius
@@ -1,6 +1,8 @@
 .js-tooltip {
   position: relative;
   display: inline-block;
+  height: 1.5rem;
+  vertical-align: -0.375rem;
 
   &:hover .tooltip__content {
     display: inline-block;
diff --git a/templates/widgets/form.hamlet b/templates/widgets/form.hamlet
index 2c0cfc9b8..79c2178a6 100644
--- a/templates/widgets/form.hamlet
+++ b/templates/widgets/form.hamlet
@@ -6,10 +6,11 @@ $case formLayout
       $# TODO: add class 'form-group--submit' if this is the submit-button view
       <div .form-group :fvRequired view:.form-group--required :not $ fvRequired view:.form-group--optional :isJust $ fvErrors view:.form-group--has-error>
         $if not (Blaze.null $ fvLabel view)
-          <label .form-group__label for=#{fvId view}>#{fvLabel view}
+          <label .form-group__label for=#{fvId view}>
+            #{fvLabel view}
+            $maybe tooltip <- fvTooltip view
+              <div .js-tooltip>
+                <div .tooltip__handle>
+                <div .tooltip__content>^{tooltip}
         <div .form-group__input>
           ^{fvInput view}
-          $maybe tooltip <- fvTooltip view
-            <div .js-tooltip>
-              <div .tooltip__handle>
-              <div .tooltip__content>^{tooltip}