diff --git a/src/css/default/LSformElement_supannCompositeAttribute.css b/src/css/default/LSformElement_supannCompositeAttribute.css
index 0a9f91ff..33ecb7a6 100644
--- a/src/css/default/LSformElement_supannCompositeAttribute.css
+++ b/src/css/default/LSformElement_supannCompositeAttribute.css
@@ -12,14 +12,23 @@ ul.LSformElement_supannCompositeAttribute p {
 }
 
 ul.LSformElement_supannCompositeAttribute p label {
+	display: inline-block;
+	height: 100%;
+	vertical-align: top;
+	width: 11rem;
 	font-weight: bold;
 }
 
+ul.LSformElement_supannCompositeAttribute p span {
+	vertical-align: bottom;
+}
+
 input.LSformElement_supannCompositeAttribute_search {
 	border: 1px solid #CCC;
 	width: 200px;
 	background: url('../image/find') no-repeat scroll 0% 0% #FFF !important;
 	padding-left: 18px;
+	margin-left: 11rem;
 }
 
 div.supannCompositeAttribute_possibleValues ul {
@@ -28,6 +37,7 @@ div.supannCompositeAttribute_possibleValues ul {
 	margin: 0;
 	border: 1px solid #CCC;
 	border-collapse: collapse;
+	margin-left: 11rem;
 }
 
 div.supannCompositeAttribute_possibleValues li {
diff --git a/src/css/light-blue.css b/src/css/light-blue.css
index e59c28d4..9282c792 100644
--- a/src/css/light-blue.css
+++ b/src/css/light-blue.css
@@ -198,7 +198,7 @@ td.LSobject-list, tr.LSobject-list, table.LStable tbody td, table.LStable th {
 		padding: 2px;
 	}
 
-	.LSform input[type=text], .LSform input[type=password], .LSform select, .LSform textarea, ul.LSformElement_text_autocomplete, ul.LSformElement_select_object_edit, div.LSformElement_wysiwyg_container, ul.LSformElement_jsonCompositeAttribute:not(.LSformElement_jsonCompositeAttribute_fullWidth), dd.LSform-errors, input.LSformElement_supannLabeledValue_search {
+	.LSform input[type=text], .LSform input[type=password], .LSform select, .LSform textarea, ul.LSformElement_text_autocomplete, ul.LSformElement_select_object_edit, div.LSformElement_wysiwyg_container, ul.LSformElement_jsonCompositeAttribute:not(.LSformElement_jsonCompositeAttribute_fullWidth), ul.LSformElement_supannCompositeAttribute, dd.LSform-errors, input.LSformElement_supannLabeledValue_search, ul.LSformElement_supannLabeledValue {
 		width: 32vw;
 	}
 
@@ -206,8 +206,8 @@ td.LSobject-list, tr.LSobject-list, table.LStable tbody td, table.LStable th {
 		width: auto;
 	}
 
-	ul.LSformElement_jsonCompositeAttribute div label {
-		width: 10rem;
+	ul.LSformElement_jsonCompositeAttribute div label, ul.LSformElement_supannCompositeAttribute p label {
+		width: 11rem;
 	}
 	ul.LSformElement_jsonCompositeAttribute_fullWidth div label {
 		width: 16rem;
@@ -222,8 +222,13 @@ td.LSobject-list, tr.LSobject-list, table.LStable tbody td, table.LStable th {
 		width: 100%;
 	}
 
-	ul.LSformElement_jsonCompositeAttribute:not(.LSformElement_jsonCompositeAttribute_fullWidth) div input[type=text], ul.LSformElement_jsonCompositeAttribute:not(.LSformElement_jsonCompositeAttribute_fullWidth) div select {
-		width: calc(32vw - 10rem - 16px);
+	ul.LSformElement_jsonCompositeAttribute:not(.LSformElement_jsonCompositeAttribute_fullWidth) div input[type=text], ul.LSformElement_jsonCompositeAttribute:not(.LSformElement_jsonCompositeAttribute_fullWidth) div select, ul.LSformElement_supannCompositeAttribute p input[type=text], ul.LSformElement_supannCompositeAttribute p select {
+		width: calc(32vw - 11rem - 16px);
+	}
+
+  /* LSformElement_supannCompositeAttribute - Make date input smaller to leave space for buttons */
+	ul.LSformElement_supannCompositeAttribute p input[type=text].LSformElement_date {
+		width: calc(32vw - 11rem - 16px - 40px);
 	}
 
 	.LSform select.LSformElement_labeledValue {
@@ -235,7 +240,7 @@ td.LSobject-list, tr.LSobject-list, table.LStable tbody td, table.LStable th {
   }
 
   .LSform select.LSformElement_supannLabeledValue_label, .LSform input.LSformElement_supannLabeledValue_label {
-    width: 6em;
+    width: 10rem;
   }
 
   .LSform input.LSformElement_supannLabeledValue_value, textarea.LSformElement_supannLabeledValue_value {