diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
index cb730f24c1..0f15dcb384 100644
--- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
+++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less
@@ -16,6 +16,7 @@
     padding: 10px 10px 10px;
     color: @b7grey;
     width: 75px;
+    white-space: pre-line;
 }
 
 .JobResultsStdOut-lineNumberColumn--first{
@@ -26,6 +27,10 @@
 .JobResultsStdOut-stdoutColumn{
     padding: 10px 20px 10px 20px;
     color: @default-interface-txt;
+    display: inline-block;
+    white-space: pre-wrap;
+    word-wrap: normal;
+    width:100%;
 }
 
 .JobResultsStdOut-stdoutColumn--first{
diff --git a/awx/ui/client/src/job-results/parse-stdout.service.js b/awx/ui/client/src/job-results/parse-stdout.service.js
index 482aa33812..b73301bb70 100644
--- a/awx/ui/client/src/job-results/parse-stdout.service.js
+++ b/awx/ui/client/src/job-results/parse-stdout.service.js
@@ -11,11 +11,20 @@ export default [function(){
             // that i'm currently seeing on this branch on the beginning
             // and end of each event string. In the future it could be
             // used to add styling classes to the actual lines of stdout
-            line = line.replace(/rn/g, '\r\n');
+            line = line.replace(/rn/g, '');
             line = line.replace(/u001b/g, '');
+
+            // ok
             line = line.replace(/\[0;32m/g, '<span class="ansi33">');
+
+            //unreachable
+            line = line.replace(/\[1;31m/g, '<span class="ansi1 ansi31">');
+            line = line.replace(/\[0;31m/g, '<span class="ansi1 ansi31">');
+
             line = line.replace(/\[0;32m=/g, '<span class="ansi32">');
             line = line.replace(/\[0;32m1/g, '<span class="ansi36">');
+
+            //end span
             line = line.replace(/\[0m/g, '</span>');
             return line;
         },