diff --git a/skins/elastic/styles/layout.less b/skins/elastic/styles/layout.less
index a5e6416b5..49f4e892b 100644
--- a/skins/elastic/styles/layout.less
+++ b/skins/elastic/styles/layout.less
@@ -174,10 +174,6 @@ html.iframe body {
     #layout > .content {
         height: 100%;
     }
-
-    .frame-content {
-        padding: 1rem;
-    }
 }
 
 
diff --git a/skins/elastic/styles/widgets/common.less b/skins/elastic/styles/widgets/common.less
index 8654357a8..62beee1a9 100644
--- a/skins/elastic/styles/widgets/common.less
+++ b/skins/elastic/styles/widgets/common.less
@@ -33,6 +33,20 @@
     opacity: .92;
 }
 
+.frame-content {
+    padding: 1rem;
+
+    h2 {
+        font-weight: bold;
+        font-size: 1.5em;
+    }
+
+    h3 {
+        font-weight: bold;
+        font-size: 1.25em;
+    }
+}
+
 .listbox .scroller {
     width: 100%;
     overflow-x: hidden;
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 52f6ed142..3a9665bb0 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -23,11 +23,23 @@ input.smart-upload {
     opacity: 0;
 }
 
-/* TODO: review when decided what css framework to use */
-.propform:not(.popupmenu) {
-    width: 100%;
+
+.propform {
+    /* TODO: do we need this? */
+    &:not(.popupmenu) {
+        width: 100%;
+    }
 }
 
+.propform,
+.formcontent {
+    legend {
+        font-weight: bold;
+        font-size: 1.2em;
+    }
+}
+
+
 /* Forms fixes for IE and Edge */
 html.ms .propform {
     .row:not(.form-check) > td {
@@ -134,7 +146,6 @@ html.ms .propform {
     }
 }
 
-
 .popup form.propform {
     padding: .5rem;
     overflow-x: hidden;