2 files changed, 21 insertions, 7 deletions

diff --git a/themes/fledermaus/contrib/media/cascade.css b/themes/fledermaus/contrib/media/cascade.css
index ad1de6f46..a7245ae60 100644
--- a/themes/fledermaus/contrib/media/cascade.css
+++ b/themes/fledermaus/contrib/media/cascade.css
@@ -196,14 +196,21 @@ table th, table, td {
 	text-align: right;
 }
 
+.cbi-value {
+	display: table-row;
+}
+
 .cbi-value-title {
+	display: table-cell;
 	line-height: 1.75em;
-	width: 15em;
 	font-weight: bold;
+	padding: 0.25em;
 }
 
 .cbi-value-field {
+	display: table-cell;
 	text-align: left;
+	padding: 0.25em;
 	line-height: 1.75em;
 }
 
@@ -219,8 +226,10 @@ table th, table, td {
 }
 
 .cbi-value-description {
+	display: inline;
 	font-style: italic;
 	font-size: 0.8em; 
+	padding: 0.25em;
 	margin-bottom: 0.5em;
 }
 
@@ -229,11 +238,10 @@ table th, table, td {
 }
 
 .cbi-section-node {
-	display: block;
+	display: table;
+	padding: 0.25em;
 	background: #f7f7f7;
 	border: 1px solid #d7d7d7;
-	overflow: auto;
-	margn-bottom: 0%;
 }
 
 .cbi-section-node h3 {
diff --git a/themes/fledermaus/contrib/media/cbi.js b/themes/fledermaus/contrib/media/cbi.js
index f9e463bca..a3a47aa45 100644
--- a/themes/fledermaus/contrib/media/cbi.js
+++ b/themes/fledermaus/contrib/media/cbi.js
@@ -16,15 +16,21 @@ function cbi_d_update(target) {
 	}
 	
 	for (var x in cbi_d[target]) {
-		for (var i=0; i<cbi_d[target][x].length; i++) {			
-			document.getElementById(cbi_d[target][x][i]).style.display = "none";
+		for (var i=0; i<cbi_d[target][x].length; i++) {	
+			var y = document.getElementById(cbi_d[target][x][i])	
+			y.style.display = "none";
 		}
 	}
 	
 	var t = document.getElementById(target);
 	if (t && t.value && cbi_d[target][t.value]) {
 		for (var i=0; i<cbi_d[target][t.value].length; i++) {			
-			document.getElementById(cbi_d[target][t.value][i]).style.display = "block";
+			var y = document.getElementById(cbi_d[target][t.value][i])
+			if (!y.value) {	
+				y.style.display = "table-row";
+			} else {
+				y.style.display = "block";
+			}
 		}
 	}
 }