diff --git a/cfg/apache.config.php b/cfg/apache.config.php
index 1541f3d1..e4cf2fec 100644
--- a/cfg/apache.config.php
+++ b/cfg/apache.config.php
@@ -57,7 +57,7 @@ function apache_get_config( $type , $file , $software , $counter ) {
 		if ( $test === 1 ) {
 			return<<<EOF
 		"$software$counter": {
-			"display" : "Apache Error #$counter",
+			"display" : $file_json_encoded,
 			"path"    : $file_json_encoded,
 			"refresh" : 5,
 			"max"     : 10,
@@ -104,7 +104,7 @@ function apache_get_config( $type , $file , $software , $counter ) {
 
 			return<<<EOF
 		"$software$counter": {
-			"display" : "Apache Error #$counter",
+			"display" : $file_json_encoded,
 			"path"    : $file_json_encoded,
 			"refresh" : 5,
 			"max"     : 10,
@@ -144,7 +144,7 @@ function apache_get_config( $type , $file , $software , $counter ) {
 
 		return<<<EOF
 		"$software$counter": {
-			"display" : "Apache Access #$counter",
+			"display" : $file_json_encoded,
 			"path"    : $file_json_encoded,
 			"refresh" : 0,
 			"max"     : 10,
diff --git a/css/config.inc.css b/css/config.inc.css
index f2aec1ba..b7bb24c5 100644
--- a/css/config.inc.css
+++ b/css/config.inc.css
@@ -104,3 +104,9 @@ tr:nth-child(even)       td.marker { background-color : #ffff00!important; }
 tr:nth-child(odd):hover  td.marker { background-color : #e8e800!important; }
 tr:nth-child(even):hover td.marker { background-color : #f8f800!important; }
 
+/* Make sure dropdown menu isn't too skinny for longer menu items */
+.navbar-nav>li>.dropdown-menu {
+    width: auto !important;
+    max-width: none !important;
+}
+