diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index ab5f2178f..b78d81b29 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -159,7 +159,6 @@ h4 {
 .main__content {
   position: relative;
   background-color: white;
-  z-index: 0;
   overflow: hidden;
 
   > .container {
@@ -291,7 +290,7 @@ a.btn.btn-info:hover,
 
 .table__td {
   font-size: 16px;
-  color: #808080;
+  color: var(--color-font);
   line-height: 1.4;
   vertical-align: top;
 }
diff --git a/templates/standalone/alerts.lucius b/templates/standalone/alerts.lucius
index 8856a9b61..4d080cc8d 100644
--- a/templates/standalone/alerts.lucius
+++ b/templates/standalone/alerts.lucius
@@ -13,6 +13,7 @@
 
   .alerts {
     top: 150px;
+    bottom: auto;
   }
 }
 
diff --git a/templates/widgets/form.julius b/templates/widgets/form.julius
index 2c6100e7d..b36ea327b 100644
--- a/templates/widgets/form.julius
+++ b/templates/widgets/form.julius
@@ -10,6 +10,12 @@
     if (requireds.length == 0) {
       return false;
     }
+    if (typeof button.dataset.formnorequired !== 'undefined' && button.dataset.formnorequired !== null) {
+      button.addEventListener('click', function() {
+        form.submit();
+      });
+      return false;
+    }
     updateButtonState();
 
     requireds.forEach(function(el) {
@@ -66,10 +72,10 @@ document.addEventListener('DOMContentLoaded', function() {
   var forms = document.querySelectorAll('form');
   Array.from(forms).forEach(function(form) {
     // auto reactiveButton submit-buttons with required fields
-    var submitBtn = form.querySelector('[type=submit]');
-    if (submitBtn) {
+    var submitBtns = Array.from(form.querySelectorAll('[type=submit]'));
+    submitBtns.forEach(function(submitBtn) {
       window.utils.reactiveButton(form, submitBtn, validateForm);
-    }
+    });
 
     // auto conditonal fieldsets
     var fieldSets = Array.from(form.querySelectorAll('fieldset[data-conditional-id][data-conditional-value]'));
diff --git a/templates/widgets/form.lucius b/templates/widgets/form.lucius
index f4d336fdf..094758416 100644
--- a/templates/widgets/form.lucius
+++ b/templates/widgets/form.lucius
@@ -1,3 +1,15 @@
 .hidden {
-  display: none;
+  visibility: hidden;
+  height: 0;
+  opacity: 0;
+}
+
+
+fieldset {
+  border: 0;
+  margin: 20px 0 30px;
+
+  legend {
+    display: none;
+  }
 }