diff --git a/ui/js/components/elements/tree.jsx b/ui/js/components/elements/tree.jsx
index e82aa58..0643d8c 100644
--- a/ui/js/components/elements/tree.jsx
+++ b/ui/js/components/elements/tree.jsx
@@ -35,37 +35,44 @@ d3.selection.prototype.tspans2 = function(lines, lh) {
 				return '<tspan fill="' + ((['errors', 'error', 'red'].indexOf(k) != -1) ? 'red' : '') + '">' + d[k] + '</tspan>'
 			}).join('')
 		})
-}
+}	
 
 
-d3.wordwrap = function (line, maxCharactersPerLine, maxLines = 2) {
-	var parts = line.split(/([^a-z][a-z]*)/), //split at non-words
+d3.wordwrap = function (line = '', maxCharactersPerLine = 43, maxLines = 3) {
+	const regexChecks = [/_/ig, /-/ig, /([A-Z])/g];
+	var parts = [],
 		lines = [],
-		words = [],
-		maxChars = maxCharactersPerLine || 40
+		words = [];
+
+	const parts = regexChecks.reduce((accumulator, regexCheck, index) => {
+		if(line.search(regexCheck) >= 0) {
+			accumulator.push(line.replace(regexChecks[index], (index == 2 ? ' $1' : ' ')).split(' '));
+		}
+		return accumulator;
+	}, []);
 
 	parts.forEach(function (part) {
 		if (part) {
-			if (words.length > 0 && (words.join('').length + part.length) > maxChars) {
-				lines.push(words.join(''))
+			if (words.length > 0 && (words.join(' ').length + part.length) > maxCharactersPerLine) {
+				lines.push(words.join(' '))
 				words = []
 			}
-			//if it's too long, chop it
-			while (part.length > maxChars) {
-				lines.push(part.slice(0, maxChars - 1) + '-')
-				part = part.slice(maxChars - 1)
+			//if the word is too long, chop it
+			while (part.length > maxCharactersPerLine) {
+				lines.push(part.slice(0, maxCharactersPerLine - 1) + '-')
+				part = part.slice(maxCharactersPerLine - 1)
 			}
 			words.push(part)
 		}
 	})
 
 	if (words.length) {
-		lines.push(words.join(''))
+		lines.push(words.join(' '))
 	}
 
 	if (lines.length > maxLines) {
 		lines = lines.slice(0, maxLines)
-		lines[1] += '...'
+		lines[maxLines - 1] += '...'
 	}
 
 	return lines
@@ -589,7 +596,7 @@ class Tree extends React.Component {
 				})
 
 			nodeText.tspans2(function (d) {
-				return d3.wordwrap((d.label || '').toString().replace(/_/ig, ' '), 20) //12
+				return d3.wordwrap((d.label || ''));
 			})
 
 			nodeText.call(me.getBB)