diff --git a/sites/all/themes/gui/guibik/css/guibik.css b/sites/all/themes/gui/guibik/css/guibik.css
index 2fd96024..8070489c 100644
--- a/sites/all/themes/gui/guibik/css/guibik.css
+++ b/sites/all/themes/gui/guibik/css/guibik.css
@@ -206,6 +206,14 @@ li {
   zoom: 1;
   *display: inline;
 }
+#user-profile-form .form-item-language,
+.node-form .form-item-language,
+#user-profile-form .form-type-select,
+.node-form .form-type-select {
+  border: 1px solid #ddd;
+  border-radius: 5px;
+  overflow-x: hidden;
+}
 #user-profile-form .form-item-language > label,
 .node-form .form-item-language > label,
 #user-profile-form .form-type-select > label,
@@ -219,18 +227,33 @@ li {
   vertical-align: top;
   zoom: 1;
   *display: inline;
+  vertical-align: middle;
 }
 #user-profile-form .form-item-language > label,
 .node-form .form-item-language > label,
 #user-profile-form .form-type-select > label,
 .node-form .form-type-select > label {
-  width: 35%;
+  width: 38%;
+  text-align: left;
 }
 #user-profile-form .form-item-language > select,
 .node-form .form-item-language > select,
 #user-profile-form .form-type-select > select,
 .node-form .form-type-select > select {
-  max-width: 60%;
+  width: 60%;
+  text-align: left;
+}
+#user-profile-form .form-item-language.form-disabled label,
+.node-form .form-item-language.form-disabled label,
+#user-profile-form .form-type-select.form-disabled label,
+.node-form .form-type-select.form-disabled label {
+  margin-right: 3em;
+}
+#user-profile-form .form-item-language.form-disabled select,
+.node-form .form-item-language.form-disabled select,
+#user-profile-form .form-type-select.form-disabled select,
+.node-form .form-type-select.form-disabled select {
+  margin-right: -3em;
 }
 #user-profile-form .form-type-textfield > label,
 .node-form .form-type-textfield > label,
diff --git a/sites/all/themes/gui/guibik/less/guibik.less b/sites/all/themes/gui/guibik/less/guibik.less
index 1d3c8f61..36fa8b17 100644
--- a/sites/all/themes/gui/guibik/less/guibik.less
+++ b/sites/all/themes/gui/guibik/less/guibik.less
@@ -89,6 +89,7 @@ select.form-select:focus:disabled{
           box-shadow: #fff 0 0 0px;
 }
 
+
 span.autocomplete-deluxe-button{top:0.25em;}
 
 .fieldset {
@@ -190,10 +191,25 @@ li{list-style: none inside url();}
 	}
 
 	.form-item-language, 	.form-type-select{
-		&>label, &>select{.inlineblock();}
-		&>label{width:35%;}
-		&>select{max-width:60%;}
+    // width:100%;
+    border: 1px solid #ddd;
+    border-radius: 5px;
+    overflow-x: hidden;
+    // text-align: right;
 
+    &>label, &>select{.inlineblock(); vertical-align: middle;}
+		&>label{width:38%; text-align: left;}
+		&>select{
+      width:60%;
+      text-align: left
+    }
+
+    &.form-disabled{
+      label{margin-right:3em; }
+      select{
+        margin-right:-3em;
+      }
+    }
 	}
 
 	.form-type-textfield{