diff --git a/src/sao.less b/src/sao.less
index a6c392ce4c..13491f9066 100644
--- a/src/sao.less
+++ b/src/sao.less
@@ -132,11 +132,16 @@ button {
 
 .form {
     width: 100%;
-    & table.form-container {
-        width: 100%;
-        & > tbody > tr > td {
-            padding: 1px;
-        }
+    & table.form-container > tbody > tr > td {
+        padding: 1px;
+    }
+    & table.form-hcontainer > tbody > tr > td {
+        padding-top: 0px;
+        padding-bottom: 0px;
+    }
+    & table.form-vcontainer > tbody > tr > td {
+        padding-left: 0px;
+        padding-right: 0px;
     }
     & td.form-label {
         white-space: pre;
diff --git a/src/view/form.js b/src/view/form.js
index 88e866d5cc..104193e486 100644
--- a/src/view/form.js
+++ b/src/view/form.js
@@ -449,6 +449,11 @@ function eval_pyson(value){
             this.el = jQuery('<table/>', {
                 'class': 'form-container responsive responsive-noheader'
             });
+            if (this.col <= 0) {
+                this.el.addClass('form-hcontainer');
+            } else if (this.col == 1) {
+                this.el.addClass('form-vcontainer');
+            }
             this.add_row();
         },
         add_row: function() {